upstream

27 files changed, 63 insertions, 54 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index f3ff89ddd7f..0e46ba73e6e 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-19  Sam Steingold  <sds@gnu.org>
+
+        * semantic/edit.el (semantic-edits-incremental-parser): Add the
+        autoload cookie, necessary for JDEE.
+
+2011-12-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/bovine/c.el (semantic-tag-abstract-p): Fix typo.
+
 2011-11-26  Chong Yidong  <cyd@gnu.org>
 
         * semantic/wisent/python-wy.el:
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index 329d1c608c2..d553c433fc4 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -1060,11 +1060,11 @@ If the result is a list or vector, then use the data debugger to display it."
       (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.
+      ;; detect when evalled 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,
+      ;; If evalled 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))))
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index d78e95af27f..4065b848f54 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -335,7 +335,7 @@ NOTE: Not yet in use!  This is part of an SRecode conversion of
 ;
 ;          (oref this variables))
 ;
-;     ;; Add in all variables from the configuration not allready covered.
+;     ;; Add in all variables from the configuration not already covered.
 ;     (mapc (lambda (c)
 ;
 ;            (if (member (car c) conf-done)
@@ -372,7 +372,7 @@ NOTE: Not yet in use!  This is part of an SRecode conversion of
                   (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.
+    ;; Add in all variables from the configuration not already covered.
     (mapc (lambda (c)
             (if (member (car c) conf-done)
                 nil
@@ -430,7 +430,7 @@ sources variable."
                       this (oref proj configuration-default)))
          (conf-done nil)
          )
-    ;; Add in all variables from the configuration not allready covered.
+    ;; Add in all variables from the configuration not already covered.
     (mapc (lambda (c)
             (if (member (car c) conf-done)
                 nil
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 23d3aa05000..23ef4850b6a 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -46,7 +46,7 @@
 (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
+We aren't actually 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")
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 4e233f56a12..7268fb95646 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -181,7 +181,7 @@ Results in --add-missing being passed to automake."
 (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
+We aren't actually 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"))))
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/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index b02358b7243..ce8e79b19dc 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -70,7 +70,7 @@
       (let ((pentry (nth idx pf))
             (ptentry (nth idx pft)))
         (if (or (stringp pentry) (not ptentry))
-            ;; Found someting ok.  stop
+            ;; Found something ok.  Stop.
             (setq stop t)
           (setq idx (1+ idx)))))
     ;; We found the first non-tag entry.  What is the situation?
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index fe659d118e1..4da23498cfc 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -816,7 +816,7 @@ now.
     ;;
     ;; 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.
+    ;; the actual struct info of A is its 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))
@@ -1311,7 +1311,7 @@ Optional PARENT and COLOR as specified with
   "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."
+handled.  A class is abstract iff its destructor is virtual."
   (cond
    ((eq (semantic-tag-class tag) 'type)
     (require 'semantic/find)
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 98f744dca6e..1a2061d01e7 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -497,15 +497,15 @@ used to perform the override."
 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))
+        (obsoleter 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))
+                        (setq obsoleter a)))))
+      (if obsoleter
+          (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag))
         ""))))
 
 (define-mode-local-override semantic-documentation-for-tag
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 943ccf23031..9df240a3681 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -193,16 +193,16 @@ If DIRECTORY doesn't exist, create a new one."
   (eieio-instance-tracker-find filename 'file 'semanticdb-database-list))
 
 (defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file)
-                                               &optional supress-questions)
+                                               &optional suppress-questions)
   "Does the directory the database DB needs to write to exist?
-If SUPRESS-QUESTIONS, then do not ask to create the directory."
+If SUPPRESS-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
+          ((or suppress-questions
                (and (boundp 'semanticdb--inhibit-make-directory)
                     semanticdb--inhibit-make-directory))
            nil)
@@ -216,13 +216,13 @@ If SUPRESS-QUESTIONS, then do not ask to create the directory."
 
 (defmethod semanticdb-save-db ((DB semanticdb-project-database-file)
                                &optional
-                               supress-questions)
+                               suppress-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-file-directory-exists-p DB suppress-questions)
                (semanticdb-write-directory-p DB)
                )
       ;;(message "Saving tag summary for %s..." objname)
@@ -243,7 +243,7 @@ If DB is not specified, then use the current database."
           (t
            ;; @todo - It should ask if we are not called from a hook.
            ;;         How?
-           (if (or supress-questions
+           (if (or suppress-questions
                    (y-or-n-p (format "Skip Error: %s ?" (car (cdr foo)))))
                (message "Save Error: %S: %s" (car (cdr foo))
                         objname)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 4d5d8f35f51..a651e08d53c 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -210,7 +210,7 @@ This class will cache data derived during various searches.")
   "Synchronize the search index IDX with some NEW-TAGS."
   ;; Reset our parts.
   (semantic-reset idx)
-  ;; Notify dependants by clearning their indicies.
+  ;; Notify dependants by clearing their indices.
   (semanticdb-notify-references
    (oref idx table)
    (lambda (tab me)
@@ -224,7 +224,7 @@ This class will cache data derived during various searches.")
   (if (semantic-find-tags-by-class 'include new-tags)
       (progn
         (semantic-reset idx)
-        ;; Notify dependants by clearning their indicies.
+        ;; Notify dependants by clearing their indices.
         (semanticdb-notify-references
          (oref idx table)
          (lambda (tab me)
@@ -234,7 +234,7 @@ This class will cache data derived during various searches.")
     (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.
+        ;; Notify dependants by clearing their indices.
         (semanticdb-notify-references
          (oref idx table)
          (lambda (tab me)
@@ -405,10 +405,10 @@ Default action as described in `semanticdb-find-translate-path'."
         ;; 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's go look up our indices.
               (let ((ans (semanticdb-find-translate-path-includes--internal path)))
                 (oset index include-path ans)
-                ;; Once we have our new indicies set up, notify those
+                ;; Once we have our new indices set up, notify those
                 ;; who depend on us if we found something for them to
                 ;; depend on.
                 (when ans (semanticdb-refresh-references table))
@@ -575,7 +575,7 @@ a new path from the provided PATH."
           (setq ans (semanticdb-file-table
                      (car systemdb)
                      ;; I would expect most omniscient to return the same
-                     ;; thing reguardless of filename, but we may have
+                     ;; thing regardless of filename, but we may have
                      ;; one that can return a table of all things the
                      ;; current file needs.
                      (buffer-file-name (current-buffer))))
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 3d2128db29a..c159a26dc1e 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -227,7 +227,7 @@ it is in Emacs.")
           "Non nil if this table needs to be `Saved'.")
    (db-refs :initform nil
             :documentation
-            "List of `semanticdb-table' objects refering to this one.
+            "List of `semanticdb-table' objects referring to this one.
 These aren't saved, but are instead recalculated after load.
 See the file semantic/db-ref.el for how this slot is used.")
    (pointmax :initarg :pointmax
@@ -657,7 +657,7 @@ The file associated with OBJ does not need to be in a buffer."
 ;;; SAVE/LOAD
 ;;
 (defmethod semanticdb-save-db ((DB semanticdb-project-database)
-                               &optional supress-questions)
+                               &optional suppress-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
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 45b807df12b..6db47f8b0be 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -175,7 +175,7 @@ TOKEN is a lexical token."
   "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."
+If RULE and MATCH indices are specified, highlight those also."
   (set-buffer (oref iface :parser-buffer))
 
   (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index a2c8c5efd40..d33454eb56b 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -470,6 +470,7 @@ a 'semantic-parse-changes-failed exception with value t."
              (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
@@ -859,7 +860,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/find.el b/lisp/cedet/semantic/find.el
index b4d94321bc1..a6d86691206 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -427,7 +427,7 @@ TABLE is a tag table.  See `semantic-something-to-tag-table'."
 
 ;;; Old Style Brute Force Search Routines
 ;;
-;; These functions will search through tags lists explicity for
+;; These functions will search through tags lists explicitly for
 ;; desired information.
 
 ;; The -by-name nonterminal search can use the built in fcn
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 98b1ab55c32..1a79adc650d 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1290,7 +1290,7 @@ the change bounds to encompass the whole nonterminal tag."
           semantic-grammar-mode-keywords-3)
          nil  ;; perform string/comment fontification
          nil  ;; keywords are case sensitive.
-         ;; This puts _ & - as a word constituant,
+         ;; This puts _ & - as a word constituent,
          ;; simplifying our keywords significantly
          ((?_ . "w") (?- . "w"))))
   ;; Setup Semantic to parse grammar
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 6761a7f532b..c60ca4b4b6a 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -246,8 +246,8 @@ And also manages services that depend on tag values."
 
         ;; NOTE ON COMMENTED SAFE HERE
         ;; We used to not execute the services if the buffer was
-        ;; unparseable.  We now assume that they are lexically
-        ;; safe to do, because we have marked the buffer unparseable
+        ;; unparsable.  We now assume that they are lexically
+        ;; safe to do, because we have marked the buffer unparsable
         ;; if there was a problem.
         ;;(when safe
         (dolist (service semantic-idle-scheduler-queue)
@@ -476,7 +476,7 @@ Does nothing if the current buffer doesn't need reparsing."
       ;; 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,
+       ;; If the buffer was previously marked unparsable,
        ;; then don't waste our time.
        ((semantic-parse-tree-unparseable-p)
         nil)
@@ -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..f8e72c1027c 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))
@@ -1704,7 +1704,7 @@ If there is no error, then the last value of FORMS is returned."
                       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
+       ;; unparsable iff the special symbol was thrown.  This
        ;; will prevent future calls from parsing, but will allow
        ;; then to still return the cache.
        (when ,ret
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index ea4903c70ea..937936032d2 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -725,7 +725,7 @@ The class returned from the scope calculation is variable
               (oset scopecache localargs localargs)
               (oset scopecache localvar localvar)
               )))
-        ;; Make sure we become dependant on the typecache.
+        ;; Make sure we become dependent on the typecache.
         (semanticdb-typecache-add-dependant scopecache)
         ;; Handy debug output.
         (when (called-interactively-p 'any)
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/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index a08f4a31b30..13836f64b85 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -109,7 +109,7 @@ Only minor modes that are locally enabled are shown in the mode line."
                  (tail (or (memq elem minor-mode-alist)
                            (setq minor-mode-alist
                                  (cons elem minor-mode-alist)))))
-            (setcdr tail (nconc locals (cdr tail)))))))))      
+            (setcdr tail (nconc locals (cdr tail)))))))))
 
 (defun semantic-desktop-ignore-this-minor-mode (buffer)
   "Installed as a minor-mode initializer for Desktop mode.
@@ -438,7 +438,7 @@ 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.
+ `%'  ->  The cache is not currently parsable.
  `@'  ->  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
@@ -524,7 +524,7 @@ 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.
+ `%'  ->  The cache is not currently parsable.
  `@'  ->  Auto-parse in progress (not set here.)
 Arguments IGNORE are ignored, and accepted so this can be used as a hook
 in many situations."
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index f92ae88c14e..0aff8325252 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -51,7 +51,7 @@
 ;; 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"
+;; bound locally, without all these "reference to free variable"
 ;; compiler warnings!
 
 (defmacro wisent-context-name (name)
@@ -2640,7 +2640,7 @@ there are any reduce/reduce conflicts.")
 
 (defun wisent-print-results ()
   "Print information on generated parser.
-Report detailed informations if `wisent-verbose-flag' or
+Report detailed information if `wisent-verbose-flag' or
 `wisent-debug-flag' are non-nil."
   (when (or wisent-verbose-flag wisent-debug-flag)
     (wisent-print-useless))
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index d8e02f978b2..73445fbf13d 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -32,7 +32,7 @@
 ;;; :blank
 ;;
 ;; Using :blank means that the template should force blank lines
-;; before and after the template, reguardless of where the insertion
+;; before and after the template, regardless of where the insertion
 ;; is occurring.
 (defun srecode-semantic-handle-:blank (dict)
   "Add macros into the dictionary DICT specifying blank line spacing.
@@ -185,4 +185,3 @@ do not contain any text from preceding or following text."
 (provide 'srecode/args)
 
 ;;; srecode/args.el ends here
-
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.
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 60f277b2c9f..bbf8b881c4d 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -312,7 +312,7 @@ occur in your template.")
           (setq doit nil)))
       (goto-char pm)
       )
-    ;; Do indentation reguardless of the newline.
+    ;; Do indentation regardless of the newline.
     (when (and (eq i t) inbuff)
       (indent-according-to-mode)
       (goto-char pm))
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 0a99b7869e8..ed2b0e2cfdb 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -194,7 +194,7 @@ we can tell font lock about them.")
        '(srecode-font-lock-keywords
          nil  ;; perform string/comment fontification
          nil  ;; keywords are case sensitive.
-         ;; This puts _ & - as a word constituant,
+         ;; This puts _ & - as a word constituent,
          ;; simplifying our keywords significantly
          ((?_ . "w") (?- . "w")))))