upstream

65 files changed, 158 insertions, 140 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 2dc345b45da..e5969a3c291 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,21 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/lex.el (semantic-lex-tokens):
+        * semantic/tag-ls.el (semantic-tag-protected-p):
+        * srecode/mode.el (srecode-prefix-map): Fix typos.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede/project-am.el (project-compile-target-command): Fix typo.
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede/auto.el (ede-project-autoload):
+        * ede/proj-comp.el (ede-makefile-rule):
+        * semantic/analyze.el (semantic-analyze-current-context):
+        * semantic/ctxt.el (semantic-get-local-variables):
+        * semantic/tag-ls.el (semantic-tag-calculate-parent): Fix typos.
+
 2011-11-03  David Engster  <dengste@eml.cc>
 
         * srecode.el:
@@ -444,7 +462,7 @@
         * semantic/decorate/include.el
         (semantic-decoration-on-unknown-includes): Change light bgcolor.
         (semantic-decoration-on-includes-highlight-default): Check that
-        the include tag has a postion.
+        the include tag has a position.
 
         * semantic/complete.el (semantic-collector-local-members):
         (semantic-complete-read-tag-local-members)
@@ -547,7 +565,7 @@
         (semantic-analyzer-debug-missing-innertype): Change "prefix" to
         "symbol" in messages.
 
-        * semantic/analyze/refs.el: (semantic-analyze-refs-impl)
+        * semantic/analyze/refs.el (semantic-analyze-refs-impl)
         (semantic-analyze-refs-proto): When calculating value, make sure
         the found tag is 'similar' to the originating tag.
         (semantic--analyze-refs-find-tags-with-parent): Attempt to
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d2fb066515b..d7645bc97ed 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -75,7 +75,7 @@
 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.
 
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index cd910f35a6a..e50e9993af0 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -955,7 +955,7 @@ we move to."
 
 (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."
+Lines that are not expandable are assumed to not be contractible."
   (not (get-text-property (point) 'ddebug-noexpand)))
 
 (defun data-debug-expand-current-line ()
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 14f09517b1d..987351a25e0 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -909,7 +909,7 @@ Optional ROOTRETURN will return the root project for DIR."
         ;; recomment as we go
         ;;nil
         ))
-     ;; Do nothing if we are buiding an EDE project already
+     ;; Do nothing if we are building an EDE project already.
      (ede-constructing
       nil)
      ;; Load in the project in question.
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 09535ffce6b..d08ab543b82 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -49,7 +49,7 @@ routine instead.")
                  :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.")
+associated with a single object class, based on the initializers used.")
    (load-type :initarg :load-type
               :documentation "Fn symbol used to load this project file.")
    (class-sym :initarg :class-sym
diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el
index fed1a1b2155..ac0907e8e7f 100644
--- a/lisp/cedet/ede/custom.el
+++ b/lisp/cedet/ede/custom.el
@@ -40,7 +40,7 @@
 
 ;;; Customization Commands
 ;;
-;; These commands initialize custoization of EDE control objects.
+;; These commands initialize customization of EDE control objects.
 
 ;;;###autoload
 (defun ede-customize-project ()
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index b8759dd06ee..c1ca8b69208 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -63,7 +63,7 @@ DIR is the directory to search from."
     (if proj
         (ede-up-directory (file-name-directory
                            (oref proj :file)))
-      ;; No pre-existing project.  Lets take a wild-guess if we have
+      ;; No pre-existing project.  Let's take a wild-guess if we have
       ;; an Emacs project here.
       (when (string-match "emacs[^/]*" dir)
         (let ((base (substring dir 0 (match-end 0))))
@@ -121,7 +121,7 @@ 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.
+      ;; Doesn't already exist, so let's make one.
       (let* ((vertuple (ede-emacs-version dir)))
         (ede-emacs-project (car vertuple)
                            :name (car vertuple)
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 3d165c39016..6179d304464 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -101,7 +101,7 @@ of the anchor file for the project."
                  (setq ans SP)
                (ede-find-subproject-for-directory SP dir)))))
         ans)
-    ;; We can use inodes, so lets try it.
+    ;; We can use inodes, so let's try it.
     (let ((ans nil)
           (inode (ede--inode-for-dir dir)))
       (ede-map-subprojects
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 7eef0a4121e..7efe534a640 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -46,7 +46,7 @@
 ;; Since these projects are all so increadibly generic, a user will
 ;; need to configure some aspects of the project by hand.  In order to
 ;; enable this without configuring the project objects directly (which
-;; are auto-generated) a special ede-generic-confg object is defined to
+;; are auto-generated) a special ede-generic-config object is defined to
 ;; hold the basics.  Generic projects will identify and use these
 ;; config files.
 ;;
@@ -70,7 +70,7 @@
 ;; subclasses `ede-generic-target'.  The slots `shortname' and
 ;; `extension' should be given new initial values.
 ;;
-;; Optionally, any target method used by EDE can then be overriden.
+;; Optionally, any target method used by EDE can then be overridden.
 ;; The ede-generic-target-c-cpp has some example methods setting up
 ;; the pre-processor map and system include path.
 ;;
@@ -105,7 +105,7 @@
                   :group (default build)
                   :documentation
                   "Command used for debugging this project.")
-   ;; C target customixations
+   ;; C target customizations
    (c-include-path :initarg :c-include-path
                    :initform nil
                    :type list
@@ -133,7 +133,7 @@
 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."
-  ;; Doesn't already exist, so lets make one.
+  ;; Doesn't already exist, so let's make one.
   (let* ((alobj ede-constructing)
          (this nil))
     (when (not alobj) (error "Cannot load generic project without the autoload instance"))
@@ -249,7 +249,7 @@ All directories need at least one target.")
   "EDE Generic Project target for Misc files.
 All directories need at least one target.")
 
-;;; Automatic target aquisition.
+;;; Automatic target acquisition.
 (defun ede-generic-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))
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index e11286c710e..0ed9c3054ef 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -62,7 +62,7 @@ DIR is the directory to search from."
     (if proj
         (ede-up-directory (file-name-directory
                            (oref proj :file)))
-      ;; No pre-existing project.  Lets take a wild-guess if we have
+      ;; No pre-existing project.  Let's take a wild-guess if we have
       ;; an Linux project here.
       (when (string-match "linux[^/]*" dir)
         (let ((base (substring dir 0 (match-end 0))))
@@ -101,7 +101,7 @@ 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.
+      ;; Doesn't already exist, so let's make one.
       (ede-linux-project "Linux"
                          :name "Linux"
                          :version (ede-linux-version dir)
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 63991c54e7f..718fdf58b11 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -71,7 +71,7 @@
     (end-of-line)
     (= (preceding-char) ?\\)))
 
-;;; Programatic editing of a Makefile
+;;; Programmatic editing of a Makefile
 ;;
 (defun makefile-move-to-macro (macro &optional next)
   "Move to the definition of MACRO.  Return t if found.
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 08fc98728e1..05290158189 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -149,7 +149,7 @@ don't do it.  A value of nil means to just do it.")
           ))))
 
 (defmethod ede-proj-configure-recreate ((this ede-proj-project))
-  "Delete project THISes configure script and start over."
+  "Delete project THIS's 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))))
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 1a2843f7651..ae5796e042b 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -149,7 +149,7 @@ belonging to the target name.")
           :type list
           :custom (repeat string)
           :documentation "Scripts to execute.
-These scripst will be executed in sh (Unless the SHELL variable is overriden).
+These scripts will be executed in sh (Unless the SHELL variable is overridden).
 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.")
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 42a20cc4a1a..66c71063363 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -217,7 +217,7 @@ is found, such as a `-version' variable, or the standard header."
       (save-excursion
         (if (file-symlink-p ec)
             (progn
-              ;; Desymlinkafy
+              ;; Desymlinkify
               (rename-file ec (concat ec ".tmp"))
               (copy-file (concat ec ".tmp") ec)
               (delete-file (concat ec ".tmp"))))
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 4d68e1544a7..1c9b9bea0f4 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -50,7 +50,7 @@ All listed sources are included in the distribution.")
 
 (defvar ede-misc-source
   (ede-sourcecode "ede-misc-source"
-                  :name "Miscelaneous"
+                  :name "Miscellaneous"
                   :sourcepattern ".*")
   "Miscellaneous field definition.")
 
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index ec54d8151bc..316309092e7 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -428,7 +428,7 @@ Argument COMMAND is the command to use for compiling the target."
 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)
+  (let* ((ede-constructing t)
          (amo (object-assoc (expand-file-name "Makefile.am" directory)
                             'file ede-projects)))
     (when (not amo)
@@ -659,7 +659,7 @@ Strip out duplicates, and recurse on variables."
       ;; their object still exists!
       ;; FIGURE THIS OUT
       (project-am-expand-subdirlist 'csubprojexpanded csubproj)
-      ;; Ok, now lets look at all our sub-projects.
+      ;; Ok, now let's look at all our sub-projects.
       (mapc (lambda (sp)
               (let* ((subdir (file-name-as-directory
                               (expand-file-name
@@ -836,7 +836,7 @@ nil means that this buffer belongs to no-one."
   (oref this :name))
 
 (defmethod project-compile-target-command ((this project-am-texinfo))
-  "Default target t- use when compling a texinfo file."
+  "Default target t- use when compiling a texinfo file."
   (let ((n (oref this :name)))
     (if (string-match "\\.texi?\\(nfo\\)?" n)
         (setq n (replace-match ".info" t t n)))
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 252ce47df67..fdf61b51b68 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -297,7 +297,7 @@ 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
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
 ;    (speedbar-set-timer speedbar-update-speed)
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 71960ddecd4..065ac6d0559 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -419,7 +419,7 @@ INSTALLDIR 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
+        ;; system file.  Let's check the version of what we just
         ;; installed... just to be safe.
         (let ((newver (inversion-find-version package)))
           (if (not newver)
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index d077dd95f3c..0e7657642c2 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -637,7 +637,7 @@ SYMBOL is a function that can be overridden."
 
 (defun mode-local-print-bindings (table)
   "Print bindings in TABLE."
-  (let (us ;; List of unpecified symbols
+  (let (us ;; List of unspecified symbols
         mc ;; List of mode local constants
         mv ;; List of mode local variables
         ov ;; List of overloaded functions
@@ -656,7 +656,7 @@ SYMBOL is a function that can be overridden."
      table)
     ;; Print symbols by type
     (when us
-      (princ "\n  !! Unpecified symbols\n")
+      (princ "\n  !! Unspecified symbols\n")
       (mapc 'mode-local-print-binding us))
     (when mc
       (princ "\n  ** Mode local constants\n")
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 34d886b6807..639b46ad2cf 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1015,7 +1015,7 @@ Throw away all the old tags, and recreate the tag database."
                 :visible semantic-mode
                 :button (:toggle . global-semanticdb-minor-mode))))
 
-;; The `semantic-mode' command, in conjuction with the
+;; The `semantic-mode' command, in conjunction with the
 ;; `semantic-default-submodes' variable, toggles Semantic's various
 ;; auxiliary minor modes.
 
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 5cdd1577a6e..43e998b852e 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -106,7 +106,7 @@ 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.")
+These are classes for tags, such as 'function, or 'variable.")
    (prefixtypes :initarg :prefixtypes
            :type list
            :documentation "List of tags defining types for :prefix.
@@ -287,7 +287,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
 
     ;; For the middle entries
     (while s
-      ;; Using the tag found in TMP, lets find the tag
+      ;; Using the tag found in TMP, let's find the tag
       ;; representing the full typeographic information of its
       ;; type, and use that to determine the search context for
       ;; (car s)
@@ -302,7 +302,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
                                      (mapcar 'semantic-tag-type-members
                                              tagtype))))
                          (oset miniscope fullscope rawscope)))
-                     ;; Now analayze the type to remove metatypes.
+                     ;; Now analyze the type to remove metatypes.
                      (or (semantic-analyze-type tmp miniscope)
                          tmp))
                     (t
@@ -476,7 +476,7 @@ 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'.
+This function can be overridden 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."
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index ae993a743d6..89937f45ec8 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -188,7 +188,7 @@ FLAGS can be any number of:
       ;; Reset c.
       (setq c nil)
 
-      ;; Loop over all the found matches, and catagorize them
+      ;; Loop over all the found matches, and categorize them
       ;; as being possible features.
       (while (and loopc do-typeconstraint)
 
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 1dfbb72d416..036a6f38724 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -240,7 +240,7 @@ list of semantic tokens found."
                           matchlist nil) ;;generate exit condition
                     (if (not end)
                         (setq out nil)))
-                  ;; Nothin?
+                  ;; Nothing?
                   ))
               (setq result
                     (if (eq s starting-stream)
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 0b3e6881891..d8b004df1bd 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -240,7 +240,7 @@ Return the defined symbol as a special spp lex token."
                         (goto-char (match-end 0))
                         (looking-at "(")))
            (semantic-lex-spp-replacements-enabled nil)
-           ;; Temporarilly override the lexer to include
+           ;; Temporarily override the lexer to include
            ;; special items needed inside a macro
            (semantic-lex-analyzer #'semantic-cpp-lexer)
            (raw-stream
@@ -249,7 +249,7 @@ Return the defined symbol as a special spp lex token."
                                                  (point))))
            )
 
-      ;; Only do argument checking if the paren was immediatly after
+      ;; Only do argument checking if the paren was immediately after
       ;; the macro name.
       (if with-args
           (semantic-lex-spp-first-token-arg-list (car raw-stream)))
@@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef."
               ;; `throws' as a common name for things that toss
               ;; exceptions about.
               :throws (nth 5 tokenpart)
-              ;; Reemtrant is a C++ thingy.  Add it here
+              ;; Reentrant 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)
@@ -1128,7 +1128,7 @@ Optional PARENT and COLOR are ignored."
 
 (define-mode-local-override semantic-format-tag-canonical-name
   c-mode (tag &optional parent color)
-  "Create a cannonical name for TAG.
+  "Create a canonical 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
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index cfdd4cf6f6c..2151e9ef53b 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -463,7 +463,7 @@ Return a bovination list to use."
           ;; Try an Emacs 22 fcn.  This throws errors.
           (find-library-name (semantic-tag-name tag))
         (error
-         (message "semantic: connot find source file %s"
+         (message "semantic: cannot find source file %s"
                   (semantic-tag-name tag))))
     ;; No handy function available.  (Older Emacsen)
     (let* ((lib (locate-library (semantic-tag-name tag)))
@@ -515,7 +515,7 @@ 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
+             ;; Doc isn't in the tag itself.  Let's pull it out of the
              ;; sources.
              (let ((semantic-elisp-store-documentation-in-tag t))
                (setq tag (with-current-buffer (semantic-tag-buffer tag)
@@ -534,9 +534,9 @@ Optional argument NOSNARF is ignored."
                      (t
                       (setq d (documentation-property
                                sym 'variable-documentation)))))
-             ;; Label it as system doc.. perhaps just for debugging
+             ;; Label it as system doc. perhaps just for debugging
              ;; purposes.
-             (if d (setq d (concat "Sytem Doc: \n" d)))
+             (if d (setq d (concat "System Doc: \n" d)))
              ))
       )
 
@@ -823,7 +823,7 @@ In Emacs Lisp this is easily defined by parenthesis bounding."
   (&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 languages.  We distincly know if we are to be a
+completion than some languages.  We distinctly 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
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 18c7b5a1a50..41a569564d0 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -54,7 +54,7 @@
 ;;
 ;; Here, we will treat each section separately (excluding D)
 ;; They can then be strung together in user-visible commands to
-;; fulfil specific needs.
+;; fulfill specific needs.
 ;;
 ;; COLLECTORS:
 ;;
@@ -891,7 +891,7 @@ making the action of homing in on a token faster.")
 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
+For partial completion, SPC will disambiguate over whitespace type
 characters.  This is the last calculated version.")
    (current-exact-match :type list
                         :protection :protected
@@ -1353,7 +1353,7 @@ 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.
+  ;; NOTE TO SELF.  Find the character to type next, and emphasize it.
 
   (with-output-to-temp-buffer "*Completions*"
     (display-completion-list
@@ -1377,7 +1377,7 @@ given tag, by highlighting its location.")
    )
   "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
+Focusing is a way of differentiating among multiple tags
 which have the same name."
   :abstract t)
 
@@ -1618,7 +1618,7 @@ Display mechanism using tooltip for a list of possible completions.")
                  (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
+        ;; Let's be brave, and truncate l
         (setcdr (nthcdr (oref obj max-tags) l) nil)
         (setq msg (mapconcat 'identity l "\n"))
         (cond
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 2eddfdc1c8e..4fef5937bc3 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -154,7 +154,7 @@ Return non-nil if there is no upper context."
 (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'."
+This can be overridden with `get-local-variables'."
   ;; Disable parsing messages
   (let ((semantic--progress-reporter nil))
     (save-excursion
@@ -410,7 +410,7 @@ Depends on `semantic-type-relation-separator-character'."
           ;; Set our end point.
           (setq end (point))
 
-          ;; Now that we have gotten started, lets do the rest.
+          ;; Now that we have gotten started, let's do the rest.
           (condition-case nil
               (while (save-excursion
                        (forward-char -1)
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index d719fde3174..fe5f3c193df 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -219,7 +219,7 @@ warn instead."
 
 ;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
+; the ebrowse class isn't singleton, unlike the emacs lisp one
 (defvar-mode-local c++-mode semanticdb-project-system-databases
   ()
   "Search Ebrowse for symbols.")
@@ -296,7 +296,7 @@ If there is no database for DIRECTORY available, then
         (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
+    ;;STATIC means DBE can't 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))
@@ -331,7 +331,7 @@ If there is no database for DIRECTORY available, then
 ;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
+;      apparently for classes which definition can't 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
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 661bc8d6841..943ccf23031 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -289,7 +289,7 @@ Argument OBJ is the object to write."
         (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.
+          ;; mode display entries.
           (oset obj unmatched-syntax
                 (semantic-show-unmatched-lex-tokens-fetch))
           )
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 34718d1fdd2..35aef5d16ef 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -862,7 +862,7 @@ instead."
           (let ((tab (car (car tmp)))
                 (tags (cdr (car tmp))))
             (dolist (T tags)
-              ;; Normilzation gives specialty database tables a chance
+              ;; Normalization 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))
@@ -918,7 +918,7 @@ but should be good enough for debugging assertions."
                          result
                          " ")
               ">")
-    ;; Longer results should have an abreviated form.
+    ;; Longer results should have an abbreviated form.
     (format "#<FIND RESULT %d TAGS in %d FILES>"
             (semanticdb-find-result-length result)
             (length result))))
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 0096c1aab09..a4c4bd99f26 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -97,7 +97,7 @@ Said object must support `semantic-reset' methods.")
   (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.
+    t ;; Return true, our core file tags have changed in a relevant way.
     )
 
   ;; NO CODE HERE
@@ -368,7 +368,7 @@ a master list."
                   (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.
+                   ;; file to update its cache from its decendents.
                    ;;
                    ;; In theory, caches are only built for most includes
                    ;; only once (in the loop before this one), so this ends
@@ -473,7 +473,7 @@ found tag to be loaded."
         ;;       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.
+        ;; must be a type or a namespace.  Let's double check.
         (when (cdr type)
 
           ;; From above, there is only one tag in ans, and we prefer
@@ -511,7 +511,7 @@ found tag to be loaded."
           ;; 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
+        ;; We don't want to find-file match, so instead let's
         ;; push the filename onto the return tag.
         (when lastans
           (setq lastans (semantic-tag-copy lastans nil lastfile))
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 65897b96adb..c9013ed8c90 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -459,7 +459,7 @@ other than :table."
       (setq cache (cdr cache)))
     (if obj
         obj ;; Just return it.
-      ;; No object, lets create a new one and return that.
+      ;; No object, let's create a new one and return that.
       (setq obj (funcall desired-class "Cache" :table table))
       (object-add-to-list table 'cache obj)
       obj)))
@@ -510,7 +510,7 @@ other than :table."
       (setq cache (cdr cache)))
     (if obj
         obj ;; Just return it.
-      ;; No object, lets create a new one and return that.
+      ;; No object, let's create a new one and return that.
       (setq obj (funcall desired-class "Cache" :db db))
       (object-add-to-list db 'cache obj)
       obj)))
@@ -606,7 +606,7 @@ The file associated with OBJ does not need to be in a buffer."
   ;; The lexical table should be good too.
   (when (featurep 'semantic/lex-spp)
     (oset table lexical-table (semantic-lex-spp-save-table)))
-  ;; this implies dirtyness
+  ;; this implies dirtiness
   (semanticdb-set-dirty table)
 
   ;; Synchronize the index
@@ -941,7 +941,7 @@ DONTLOAD does not affect the creation of new database objects."
           (setq fullfile (file-truename file))
           )
 
-        ;; If we have a table, but no fullfile, that's ok.  Lets get the filename
+        ;; If we have a table, but no fullfile, that's ok.  Let's get the filename
         ;; from the table which is pre-truenamed.
         (when (and (not fullfile) tab)
           (setq fullfile (semanticdb-full-filename tab)))
diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el
index ee356ad3a9e..4eeac8de141 100644
--- a/lisp/cedet/semantic/decorate.el
+++ b/lisp/cedet/semantic/decorate.el
@@ -107,7 +107,7 @@ the extent 'intangible' property does not exist."
   "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
+  ;; Stolen blithely from cpp.el in Emacs 21.1
   (if (and (not after)
            (or (< (semantic-overlay-start overlay) start)
                (> (semantic-overlay-end overlay) end)))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index e984965a737..766a13023e8 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -296,7 +296,7 @@ This mode provides a nice context menu on the include statements."
         ;; Set ourselves up for synchronization
         (semanticdb-cache-get
          table 'semantic-decoration-unparsed-include-cache)
-        ;; Add a dependancy.
+        ;; Add a dependency.
         (let ((table semanticdb-current-table))
           (semanticdb-add-reference table tag))
         )
@@ -459,7 +459,7 @@ 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.
+wrap existing project code for Semantic's benefit.
 ")
 
       (when (or (eq mm 'c++-mode) (eq mm 'c-mode))
@@ -739,7 +739,7 @@ any decorated referring includes.")
   "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
+  ;; since we can't get in the fcn unless one exists, this ought to be
   ;; ok.
   (let ((c (semanticdb-cache-get
             table 'semantic-decoration-unparsed-include-cache)))
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index e5579d09113..ec3b5878c63 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -56,7 +56,7 @@ If nosnarf if 'lex, then only return the lex token."
           ;; 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:
+          ;;  Let's look for comments either after the definition, but before code:
           ;; Not sure yet.  Fill in something clever later....
           nil))))))
 
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 7f7e82a95c2..4ac2733a34f 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -316,7 +316,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
                   (setq list-to-search nil)))
         ;; Search list is nil.
         ))
-    ;; If we have a search list, lets go.  Otherwise nothing.
+    ;; If we have a search list, let's 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
@@ -427,7 +427,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
             ;; which must have a value by now.
 
             ;; Loop over the search list to find the preceding CDR.
-            ;; Fortunatly, (car overlapped-tags) happens to be
+            ;; Fortunately, (car overlapped-tags) happens to be
             ;; the first tag positionally.
             (let ((tokstart (semantic-tag-start (car overlapped-tags))))
               (while (and list-to-search
@@ -537,7 +537,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
       ;; 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.
+      ;; tags it encompasses.)  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
@@ -595,7 +595,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
                ;; Feb 06 -
                ;; IDed when the first cache-list tag is after
                ;; our change, meaning there is nothing before
-               ;; the chnge.
+               ;; the change.
                ((> (semantic-tag-start (car cache-list))
                    (semantic-overlay-end (car changes)))
                 (setq last-cond "Beginning of buffer")
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index c2d07fbcc35..b4d94321bc1 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -574,7 +574,7 @@ 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
+are searched.  The overloadable function `semantic-tag-components' is
 used for the searching child lists.  If SEARCH-PARTS is the symbol
 'positiononly, then only children that have positional information are
 searched.
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index fa6e7517624..876ec9bbd4a 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -291,7 +291,7 @@ local definitions."
   ;; Try and find a trail of parents from PARENT
   (let ((rlist (list parent))
         )
-    ;; IMPLELEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    ;; IMPLEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     (reverse rlist)))
 
 (define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
@@ -431,7 +431,7 @@ Optional argument COLOR means highlight the prototype with font-lock colors."
          (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.
+      ;; let's try again.
       (save-match-data
         (setq buf (find-file-noselect fname)))
       (setq doc (semantic-tag-docstring tag buf)))
@@ -603,7 +603,7 @@ This associates a symbol, such as 'public with the st ring \"+\".")
   "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:
+By default character returns are:
   public    -- +
   private   -- -
   protected -- #.
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 972ce5e26bc..137759d46ac 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -61,7 +61,7 @@
 (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.
+IGNORE any arguments.  Always parse the whole buffer.
 Each tag returned is of the form:
  (\"NAME\" section (:members CHILDREN))
 or
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 57067936a90..95a68673b8c 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -36,7 +36,7 @@
     nil
   (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap))
 
-  ;; Basic featuers.
+  ;; Basic features.
   (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)
   )
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 69b1dba0bcf..2aae39d4b21 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -115,11 +115,11 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
       (if (null syms)
           (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
+              ;; smart completions, let's divert to how senator derives
               ;; completions.
               ;;
               ;; This is a way of making this fcn more useful since
-              ;; the smart completion engine sometimes failes.
+              ;; the smart completion engine sometimes fails.
               (semantic-complete-symbol))
         ;; Use try completion to seek a common substring.
         (let ((tc (try-completion (or pre "")  syms)))
@@ -199,7 +199,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
         )
     (if pf
         (message "%s" (semantic-format-tag-summarize pf nil t))
-      (message "No summary info availalble"))))
+      (message "No summary info available"))))
 
 ;;; Variants
 ;;
@@ -245,14 +245,14 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
 ;; 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.
+;; analyzer 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.
+  ;; because of header files.  Let's try to find the actual
+  ;; implementation instead.
   (when (semantic-tag-prototype-p dest)
     (let* ((refs (semantic-analyze-tag-references dest))
            (impl (semantic-analyze-refs-impl refs t))
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 1c1233303e9..b49d1db1ad5 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -427,7 +427,7 @@ datasets."
 
 (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's check to see if EDE matters.
   (let ((ede-auto-add-method 'never))
     (dolist (a auto-mode-alist)
       (when (eq (cdr a) major-mode)
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index e7e1da55ce3..033c34e1b83 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil."
 (defcustom semantic-imenu-bucketize-type-members t
   "*Non-nil if members of a type should be grouped into buckets.
 A nil value means to keep them in the same order.
-Overriden to nil if `semantic-imenu-bucketize-file' is nil."
+Overridden to nil if `semantic-imenu-bucketize-file' is nil."
   :group 'semantic-imenu
   :type 'boolean)
 (make-variable-buffer-local 'semantic-imenu-bucketize-type-members)
@@ -393,7 +393,7 @@ Optional argument PARENT is a tag parent of STREAM."
                                         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
+                          ;; Only add a *definition* if we have a position
                           ;; in that type tag.
                           (if (semantic-tag-with-position-p tag)
                               (cons
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index e49968b07e7..8009a257a7b 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -639,7 +639,7 @@ and what valid VAL values are."
 
 ;;; Macro Merging
 ;;
-;; Used when token streams from different macros include eachother.
+;; Used when token streams from different macros include each other.
 ;; Merged macro streams perform in place replacements.
 
 (defun semantic-lex-spp-merge-streams (raw-stream)
@@ -709,7 +709,7 @@ ARGVALUES are values for any arg list, or nil."
 
 ;;; Symbol Is Macro
 ;;
-;; An analyser that will push tokens from a macro in place
+;; An analyzer that will push tokens from a macro in place
 ;; of the macro symbol.
 ;;
 (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end)
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index d6b8e1a8bf5..4da3be98f37 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -491,7 +491,7 @@ For compatibility with Semantic 1.x it defaults to `semantic-flex'.")
     (symbol)
     (whitespace)
     )
-  "An alist of of semantic token types.
+  "An alist 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.
 
@@ -1437,7 +1437,7 @@ Return either a paren token or a semantic list token depending on
 ;;; Comment lexer
 ;;
 ;; Predefined lexers that could be used instead of creating new
-;; analyers.
+;; analyzers.
 
 (define-lex semantic-comment-lexer
   "A simple lexical analyzer that handles comments.
@@ -1677,7 +1677,7 @@ When the lexer encounters the open-paren delimiter \"(\":
 ;;; Lexical Safety
 ;;
 ;; The semantic lexers, unlike other lexers, can throw errors on
-;; unbalanced syntax.  Since editing is all about changeging test
+;; unbalanced syntax.  Since editing is all about changing text
 ;; we need to provide a convenient way to protect against syntactic
 ;; inequalities.
 
@@ -1758,7 +1758,7 @@ If there is no error, then the last value of FORMS is returned."
 (semantic-alias-obsolete 'semantic-flex-map-keywords 'semantic-lex-map-keywords "23.2")
 (semantic-alias-obsolete 'semantic-flex-keywords 'semantic-lex-keywords "23.2")
 (semantic-alias-obsolete 'semantic-flex-buffer 'semantic-lex-buffer "23.2")
-(semantic-alias-obsolete 'semantic-flex-list   'semantic-lex-list "23.2")
+(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2")
 
 ;; This simple scanner uses the syntax table to generate a stream of
 ;; simple tokens of the form:
@@ -1769,7 +1769,7 @@ If there is no error, then the last value of FORMS is returned."
 ;; objects boundary.
 
 (defvar semantic-flex-tokens semantic-lex-tokens
-  "An alist of of semantic token types.
+  "An alist of semantic token types.
 See variable `semantic-lex-tokens'.")
 
 (defvar semantic-flex-unterminated-syntax-end-function
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index 88b0cc33d43..d9a3ede360d 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -313,7 +313,7 @@ TEXT TOKEN and INDENT are the details."
     (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
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
     ;; (speedbar-set-timer dframe-update-speed)
@@ -399,7 +399,7 @@ Returns the tag list, or t for an error."
     (if (listp out)
         (condition-case nil
             (progn
-              ;; This brings externally defind methods into
+              ;; This brings externally defined methods into
               ;; their classes, and creates meta classes for
               ;; orphans.
               (setq out (semantic-adopt-external-members out))
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 78a1fd049f0..16deb245527 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -186,7 +186,7 @@ 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
+      ;; Let's 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)))
@@ -249,7 +249,7 @@ are from nesting data types."
       ;;    Analyze the stack of tags we are nested in as parents.
       ;;
 
-      ;; If we have a pparent tag, lets go there
+      ;; If we have a pparent tag, let's go there
       ;; an analyze that stack of tags.
       (when (and pparent (semantic-tag-with-position-p pparent))
         (semantic-go-to-tag pparent)
@@ -384,7 +384,7 @@ be found."
 ;;------------------------------------------------------------
 
 (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist)
-  "Return accessable tags when TYPELIST and PARENTLIST is in scope.
+  "Return accessible 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
@@ -412,7 +412,7 @@ implicit \"object\"."
           ))
       (setq typelist (cdr typelist)))
 
-    ;; Loop over the types (which should be sorted by postion
+    ;; Loop over the types (which should be sorted by position)
     ;; adding to the scopelist as we go, and using the scopelist
     ;; for additional searching!
     (while typelist2
@@ -424,9 +424,9 @@ implicit \"object\"."
                           currentscope))
       (setq typelist2 (cdr typelist2)))
 
-    ;; Collect all the types (class, etc) that are in our heratage.
+    ;; Collect all the types (class, etc) that are in our heritage.
     ;; These are types that we can extract members from, not those
-    ;; delclared in using statements, or the like.
+    ;; declared in using statements, or the like.
     ;; Get the PARENTS including nesting scope for this location.
     (while parentlist
       (oset miniscope scope currentscope)
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index 1571622b29a..da250e66bb5 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -102,7 +102,7 @@ ROOTDIR is the root location to run the `find' from.
 FILEPATTERN is a string representing find flags for searching file patterns.
 GREPFLAGS are flags passed to grep, such as -n or -l.
 GREPPATTERN is the pattern used by grep."
-  ;; We have grep-compute-defaults.  Lets use it.
+  ;; We have grep-compute-defaults.  Let's use it.
   (grep-compute-defaults)
   (let* ((grep-expand-keywords semantic-symref-grep-expand-keywords)
          (cmd (grep-expand-template grep-find-template
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index 17fd3b45356..d118d9b6203 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -154,7 +154,7 @@ Depends on `semantic-dependency-include-path' for searching.  Always searches
           (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.
+                ;; onto the dependency finding with a hash table might be best.
                 ;;(if (semantic--tag-get-property tag 'dependency-file)
                 ;;  (semantic--tag-get-property tag 'dependency-file)
                 (:override
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 8f54698d506..4d001322108 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -41,7 +41,7 @@
 
 (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')
+The default behavior (if not overridden 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.)")
 
@@ -98,7 +98,7 @@ See `semantic-tag-protection'."
     prot))
 
 (defun semantic-tag-protected-p (tag protection &optional parent)
-  "Non-nil if TAG is is protected.
+  "Non-nil if TAG 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.
@@ -106,7 +106,7 @@ PARENT is the parent data type which contains TAG.
 For these PROTECTIONs, true is returned if TAG is:
 @table @asis
 @item nil
-  Always true
+  Always true.
 @item  private
   True if nil.
 @item protected
@@ -221,7 +221,7 @@ something without an implementation."
 
 (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',
+STREAM-OR-BUFFER can be anything convertible 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
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 393d64e6420..c2f080ce75b 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -421,7 +421,7 @@ Optional argument POINT is where to look for the environment."
   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
+useful.  Instead, 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)))
@@ -579,7 +579,7 @@ Note: TYPE not yet implemented."
 ;;          (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.
+;;     ;; actual function, let's make due with that.
 ;;     (if (not docstring)
 ;;      (cond ((stringp docstringvar)
 ;;             (setq docstring docstringvar
@@ -597,7 +597,7 @@ Note: TYPE not yet implemented."
 ;;     ;; 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.
+;;     ;; Use useful functions from the document library.
 ;;    (srecode-texi-insert-tag-as-doc doctag)
 ;;    ;(semantic-insert-foreign-tag doctag)
 ;;     ))
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 095a817f08d..1f52e9eb3b6 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -108,7 +108,7 @@ line ends at the end of the buffer, leave the point there."
 (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."
+indentation of the current line."
   (let ((indent (current-indentation)))
     (while (progn (wisent-python-forward-line)
                   (and (not (eobp))
@@ -291,7 +291,7 @@ To be implemented for Python!  For now just return nil."
    ;; 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
+   ;; The following is no more necessary as semantic-lex is overridden
    ;; in python-mode.
    ;; semantic-lex-analyzer 'wisent-python-lexer
 
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 052999bf7c8..d3623d6022f 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -62,11 +62,11 @@
    (dictionary :initarg :dictionary
                :type (or null srecode-dictionary)
                :documentation
-               "List of section dictinaries.
+               "List of section dictionaries.
 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.")
+any incoming dictionaries values.")
    (binding :initarg :binding
             :documentation
             "Preferred keybinding for this template in `srecode-minor-mode-map'.")
@@ -552,7 +552,7 @@ A list of defined variables VARS provides a variable table."
           (when (not hs)
             (setq hs (make-hash-table :test 'equal :size 20))
             (puthash context hs contexthash))
-          ;; Put into that contenxt's hash.
+          ;; Put into that context's hash.
           (puthash objname (car lp) hs)
           )
 
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index cae52428e75..f392379347a 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are:
   )
 
 (defun srecode-calculate-nearby-things ()
-  ;; NOTE: May need to add bounes to this FCN
+  ;; NOTE: May need to add bounds 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
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 521532bed33..62ceff82448 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -202,7 +202,7 @@ associated with a buffer or parent."
                                               :size 20)
                    :origin   origin)))
         ;; Only set up the default variables if we are being built
-        ;; directroy for a particular buffer.
+        ;; directly for a particular buffer.
         (when initfrombuff
           ;; Variables from the table we are inserting from.
           ;; @todo - get a better tree of tables.
@@ -280,7 +280,7 @@ inserted dictionaries."
           (progn
             (srecode-dictionary-show-section new "FIRST")
             (srecode-dictionary-show-section new "LAST"))
-        ;; Not the very first one.  Lets clean up CAR.
+        ;; Not the very first one.  Let's clean up CAR.
         (let ((tail (car (last ov))))
           (srecode-dictionary-hide-section tail "LAST")
           (srecode-dictionary-show-section tail "NOTLAST")
@@ -436,7 +436,7 @@ The root dictionary is usually for a current or active insertion."
 
 ;;; COMPOUND VALUE METHODS
 ;;
-;; Compound values must provide at least the toStriong method
+;; Compound values must provide at least the toString method
 ;; for use in converting the compound value into sometehing insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index a52cadbfb2c..caf1ddebdb2 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -167,7 +167,7 @@ doesn't always work correctly."
     ("str\\(ing\\)?" . "string")
     ("use?r" . "user")
     ("num\\(ber\\)?" . "number")
-    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable
+    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable
     )
   "List of common English abbreviations or full words.
 These are nouns (as opposed to verbs) for use in creating expanded
@@ -720,7 +720,7 @@ allocating something based on its type."
   "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."
+standard names, then english it instead."
   (let ((cmt "")
         (aso srecode-document-autocomment-param-alist)
         (fnd nil)
@@ -811,8 +811,8 @@ not account for verb parts."
             (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
+                  ;; don't terminate because we may actually have 2 words
+                  ;; next to each other we didn't identify before
                   (setq llow t)))
             (setq al (cdr al)))
           (if (not llow) (setq newstr (concat newstr ts)))
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index dba4b876edb..d87dc315829 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -61,12 +61,12 @@
   (oset st lastdict dict))
 
 (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state))
-  "Reset the achor point on extract state ST."
+  "Reset the anchor 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.
+  "Perform an extraction on the extract state ST with ENDPOINT.
 If there was no waiting inserter, do nothing."
   (when (oref st lastinserter)
     (save-match-data
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 088781cfb53..f13fb17ca8f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -101,7 +101,7 @@ Has virtual :start and :end initializers.")
             ))
 
     ;; Create a temporary overlay now.  We have to use an overlay and
-    ;; not a marker becaues of the in-front insertion rules.  The rules
+    ;; not a marker because of the in-front insertion rules.  The rules
     ;; are backward from what is wanted while typing.
     (setq olay (make-overlay start end (current-buffer) t nil))
     (overlay-put olay 'srecode-init-only t)
@@ -338,7 +338,7 @@ PRE-LEN is used in the after mode for the length of the changed text."
            (inhibit-modification-hooks t)
            )
       ;; Sometimes a field is deleted, but we might still get a stray
-      ;; event.  Lets just ignore those events.
+      ;; event.  Let's just ignore those events.
       (when (slot-boundp field 'overlay)
         ;; First, fixup the two overlays, in case they got confused.
         (let ((main (oref field overlay))
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index fdca64a7da1..d9765ebd449 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -103,7 +103,7 @@ 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.
+      ;; If the project directory was set, let's check it.
       (let ((dd (expand-file-name default-directory))
             (projexp (regexp-quote (directory-file-name proj))))
         (if (string-match (concat "^" projexp) dd)
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index a582d4ff59e..9a6c27dcd73 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -215,7 +215,7 @@ INCLASS specifies if the cursor is already in CLASS or not."
           (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.
+          ;; If there is a comment immediately 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))))
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 84964a9e8b4..9fbfc5dc042 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -255,7 +255,7 @@ ST can be a class, or an object."
       (let ((c (oref st code)))
         (srecode-push st)
         (srecode-insert-code-stream c dictionary))
-    ;; Poping the stack is protected
+    ;; Popping the stack is protected.
     (srecode-pop st)))
 
 (defun srecode-insert-code-stream (code dictionary)
@@ -936,7 +936,7 @@ with the dictionaries found in the dictionary."
   (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
+    ;; If we don't have a special dictionary, then just insert with the
     ;; current dictionary.
     (srecode-insert-subtemplate sti dictionary 'includedtemplate))
   )
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 6ca0cefe9a7..23d09bc9a4b 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -61,7 +61,7 @@
         (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.")
+  "Keymap used behind the srecode prefix key in srecode minor mode.")
 
 (defvar srecode-menu-bar
   (list
@@ -366,7 +366,7 @@ programming modes."
         (define-key srecode-prefix-map oldkey nil)
         )))
 
-  ;; Update Keybings
+  ;; Update Keybindings
   (let ((oldbinding (lookup-key srecode-prefix-map binding)))
 
     ;; During development, allow overrides.
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 4a1a15c1d12..956bdfbd97a 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -394,7 +394,7 @@ as `function' will leave point where code might be inserted."
         (srecode-semantic-apply-tag-to-dict tagobj dict)))
 
     ;; Insert dict-entries into the dictionary LAST so that previous
-    ;; items can be overriden.
+    ;; items can be overridden.
     (let ((entries dict-entries))
       (while entries
         (srecode-dictionary-set-value dict
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 5a407aad135..0a99b7869e8 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -483,7 +483,7 @@ section or ? for an ask variable."
 
         (if (> start (point))
             ;; If our starting point is after the found point, that
-            ;; means we are not inside the macro.  Retur nil.
+            ;; means we are not inside the macro.  Return nil.
             nil
           ;; We are inside the macro, extract the text so far.
           (let* ((macroend (match-beginning 0))
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 33440d04432..acfc2486711 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -231,7 +231,7 @@ This is to take advantage of TeXinfo's markup symbols."
     (if buffer
         (progn (set-buffer buffer)
                (srecode-texi-texify-docstring string))
-      ;; Else, no buffer, so lets do something else
+      ;; Else, no buffer, so let's do something else
       (with-mode-local texinfo-mode
         (srecode-texi-texify-docstring string)))))