Spelling fixes.

[gnu-emacs] / lisp / cedet / cedet.el

diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index e089407a19501b39bf16e3ea1eb56dc05176249b..d7645bc97edfebe55fbea51830a630b2bc3cf224 100644 (file)
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -1,11 +1,10 @@
 ;;; cedet.el --- Setup CEDET environment
 
-;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;; Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
-;; Version: 0.2
+;; Version: 1.0pre7
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -24,54 +23,59 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-;;
-;; This library automatically setups your [X]Emacs to use CEDET tools.
-;;
-;;   (require 'cedet)
-;;
-;; If you want to turn on useful or all Semantic features by default,
-;; respectively add:
-;;
-;;   (setq semantic-load-turn-useful-things-on t)
-;; or
-;;   (setq semantic-load-turn-everything-on t)
-;;
-;; before loading this file, like this:
-;;
-;;   (setq semantic-load-turn-useful-things-on t)
-;;   (require 'cedet)
-;;
-;; That's it!
 
 ;;; Code:
+;;
+;; This file depends on the major components of CEDET, so that you can
+;; load them all by doing (require 'cedet).  This is mostly for
+;; compatibility with the upstream, stand-alone CEDET distribution.
 
 (eval-when-compile
   (require 'cl))
 
-(defconst cedet-version "1.0pre7"
-  "Current version of CEDET.")
+(declare-function inversion-find-version "inversion")
 
-(require 'eieio)
-(require 'semantic)
-;; (require 'srecode)
-;; (require 'ede)
-(require 'speedbar)
+(defconst cedet-version "1.0"
+  "Current version of CEDET.")
 
 (defconst cedet-packages
   `(
     ;;PACKAGE   MIN-VERSION
     (cedet         ,cedet-version)
-    (eieio         "1.2")
-    (semantic      "2.0pre7")
-    (srecode       "1.0pre7")
-    (ede           "1.0pre7")
-    (speedbar      "1.0.3"))
-  "Table of CEDET packages to install.")
-
-(declare-function inversion-find-version "inversion")
+    (eieio         "1.3")
+    (semantic      "2.0")
+    (srecode       "1.0")
+    (ede           "1.0")
+    (speedbar      "1.0"))
+  "Table of CEDET packages installed.")
+
+(defvar cedet-menu-map ;(make-sparse-keymap "CEDET menu")
+  (let ((map (make-sparse-keymap "CEDET menu")))
+    (define-key map [semantic-force-refresh]     'undefined)
+    (define-key map [semantic-edit-menu]         'undefined)
+    (define-key map [navigate-menu]              'undefined)
+    (define-key map [semantic-options-separator] 'undefined)
+    (define-key map [global-semantic-highlight-func-mode]   'undefined)
+    (define-key map [global-semantic-highlight-func-mode]   'undefined)
+    (define-key map [global-semantic-decoration-mode]       'undefined)
+    (define-key map [global-semantic-idle-completions-mode] 'undefined)
+    (define-key map [global-semantic-idle-summary-mode]     'undefined)
+    (define-key map [global-semantic-idle-scheduler-mode]   'undefined)
+    (define-key map [global-semanticdb-minor-mode]          'undefined)
+    (define-key map [cedet-menu-separator] 'undefined)
+    (define-key map [ede-find-file]        'undefined)
+    (define-key map [ede-speedbar]         'undefined)
+    (define-key map [ede] 'undefined)
+    (define-key map [ede-new]              'undefined)
+    (define-key map [ede-target-options]   'undefined)
+    (define-key map [ede-project-options]  'undefined)
+    (define-key map [ede-build-forms-menu] 'undefined)
+    map)
+  "Menu keymap for the CEDET package.
+This is used by `semantic-mode' and `global-ede-mode'.")
 
 (defun cedet-version ()
-  "Display all active versions of CEDET and Dependant packages.
+  "Display all active versions of CEDET and Dependent packages.
 
 The PACKAGE column is the name of a given package from CEDET.
 
@@ -79,7 +83,7 @@ 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.
+for the specified PACKAGE.
 
 LOADED VERSION is the version of PACKAGE current loaded in Emacs
 memory and (presumably) running in this Emacs instance.  Value is X