merge trunk

7 files changed, 9 insertions, 9 deletions

diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 53639b19a96..35841d2a6b2 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -199,12 +199,12 @@ not an indication of new features or bug fixes."
              (= 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          ; all or nothing 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          ; all or nothing if elt - is =
              (< v1-3 v2-3))
         (and (= v1-1 v2-1)
              (< v1-2 v2-2))
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3355ed83a91..337413caf75 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -680,7 +680,7 @@ Does nothing if the current buffer doesn't need reparsing."
                     (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.
+              ;; probably 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
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index a2c8c5efd40..3fbcf6d932f 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -859,7 +859,7 @@ pre-positioned to a convenient location."
           (setq cacheend chil)
           (while (and cacheend (not (eq last (car cacheend))))
             (setq cacheend (cdr cacheend)))
-          ;; The splicable part is after cacheend.. so move cacheend
+          ;; The spliceable part is after cacheend.. so move cacheend
           ;; one more tag.
           (setq cacheend (cdr cacheend))
           ;; Splice the found end tag into the cons cell
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 6761a7f532b..4b3a51e79f7 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -515,7 +515,7 @@ Does nothing if the current buffer doesn't need reparsing."
                         (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.
+                  ;; probably 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
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index ba43ba657a1..dab5c444fae 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -1248,7 +1248,7 @@ they are comment end characters) AND when you want whitespace tokens."
   (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
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
               (match-end 0))
@@ -1271,7 +1271,7 @@ they are comment end characters)."
   (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
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (progn
         (setq semantic-lex-end-point (match-end 0))
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 4d001322108..2f585cbdf45 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -195,7 +195,7 @@ See `semantic-tag-static-p'."
 ;;;###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
+For some languages, such as C, a prototype is a declaration of
 something without an implementation."
   )
 
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index f13fb17ca8f..f4d34a0f2ab 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -324,7 +324,7 @@ Try to use this to provide useful completion when available.")
   )
 
 (defvar srecode-field-replication-max-size 100
-  "Maximum size of a field before cancelling replication.")
+  "Maximum size of a field before canceling replication.")
 
 (defun srecode-field-mod-hook (ol after start end &optional pre-len)
   "Modification hook for the field overlay.