Merge from trunk.

13 files changed, 13 insertions, 13 deletions

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/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/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 0b3e6881891..1076402ac91 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -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)))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index e984965a737..a37f43d177f 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))
         )
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 7f7e82a95c2..307071e743c 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -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
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index fa6e7517624..381801559da 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)
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/scope.el b/lisp/cedet/semantic/scope.el
index 78a1fd049f0..53695015e4a 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -426,7 +426,7 @@ implicit \"object\"."
 
     ;; 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.
+    ;; 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/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/texi.el b/lisp/cedet/semantic/texi.el
index 393d64e6420..30c5a5cf8b6 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)))
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index dba4b876edb..80e6f9d8d1c 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -66,7 +66,7 @@
 
 (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/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/mode.el b/lisp/cedet/srecode/mode.el
index 6ca0cefe9a7..bb2db79acc6 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -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.