upstream

4 files changed, 4 insertions, 5 deletions

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")))))