from trunk

5 files changed, 23 insertions, 25 deletions

diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 89ae36bcf9e..bdb9268a030 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -442,7 +442,7 @@ If FORCE equals 'newfile, then the cache is ignored."
               (setq ans calc))
           ;; If we failed to calculate something, we
           ;; should add it to the hash, but ONLY if we are not
-          ;; going to FORCE the file into existance.
+          ;; going to FORCE the file into existence.
           (when (not force)
             (ede-locate-add-file-to-hash loc filename 'nomatch))))
       ))
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index c57da3a5aa5..0f18d49b7c3 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -81,15 +81,13 @@ common hook `after-change-functions'.")
 
 (defvar semantic-reparse-needed-change-hook nil
   "Hooks run when a user edit is detected as needing a reparse.
-For language specific hooks, make sure you define this as a local
-hook.
-Not used yet; part of the next generation reparse mechanism")
+For language specific hooks, make sure you define this as a local hook.
+Not used yet; part of the next generation reparse mechanism.")
 
 (defvar semantic-no-reparse-needed-change-hook nil
   "Hooks run when a user edit is detected as not needing a reparse.
 If the hook returns non-nil, then declare that a reparse is needed.
-For language specific hooks, make sure you define this as a local
-hook.
+For language specific hooks, make sure you define this as a local hook.
 Not used yet; part of the next generation reparse mechanism.")
 
 (defvar semantic-edits-new-change-hooks nil
@@ -307,7 +305,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
                     (semantic-tag-components (car tags)))
               ;; Ok, we are completely encompassed within the first tag
               ;; entry, AND that tag has children.  This means that change
-              ;; occured outside of all children, but inside some tag
+              ;; occurred outside of all children, but inside some tag
               ;; with children.
               (if (or (not (semantic-tag-with-position-p (car list-to-search)))
                       (> start (semantic-tag-end
@@ -751,7 +749,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
 
 ;;;; Whitespace change
        ((and (not tags) (not newf-tags))
-        ;; A change that occured outside of any existing tags
+        ;; A change that occurred outside of any existing tags
         ;; and there are no new tags to replace it.
         (when semantic-edits-verbose-flag
           (message "White space changes"))
@@ -760,7 +758,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
 
 ;;;; New tags in old whitespace area.
        ((and (not tags) newf-tags)
-        ;; A change occured outside existing tags which added
+        ;; A change occurred outside existing tags which added
         ;; a new tag.  We need to splice these tags back
         ;; into the cache at the right place.
         (semantic-edits-splice-insert newf-tags parent-tag cache-list)
@@ -775,7 +773,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
 
 ;;;; Old tags removed
        ((and tags (not newf-tags))
-        ;; A change occured where pre-existing tags were
+        ;; A change occurred where pre-existing tags were
         ;; deleted!  Remove the tag from the cache.
         (semantic-edits-splice-remove tags parent-tag cache-list)
 
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index 7f6ddc85bfc..af312494a81 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -900,7 +900,7 @@ START and END define the bounds of the token in the current buffer.
 Optional STR is the string for the token only if the bounds in
 the buffer do not cover the string they represent.  (As from
 macro expansion.)"
-  ;; This if statement checks the existance of a STR argument at
+  ;; This if statement checks the existence of a STR argument at
   ;; compile time, where STR is some symbol or constant.  If the
   ;; variable STr (runtime) is nil, this will make an incorrect decision.
   ;;
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 30a836c89b2..bb15bf50110 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -33,7 +33,7 @@
 ;;
 ;; Using :blank means that the template should force blank lines
 ;; before and after the template, reguardless of where the insertion
-;; is occuring.
+;; is occurring.
 (defun srecode-semantic-handle-:blank (dict)
   "Add macros into the dictionary DICT specifying blank line spacing.
 The wrapgap means make sure the first and last lines of the macro
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 4777470d473..1ccd4e8d393 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -201,7 +201,7 @@ Apply anything learned to the dictionary DICT."
   "Resolve arguments in the argument list ARGS.
 ARGS is a list of symbols, such as :blank, or :file.
 Apply values to DICT.
-Optional argument TEMP is the template that is getting it's arguments resolved."
+Optional argument TEMP is the template that is getting its arguments resolved."
   (let ((fcn nil))
     (while args
       (setq fcn (intern-soft (concat "srecode-semantic-handle-"
@@ -334,14 +334,14 @@ occur in your template.")
    ((key :initform "\r"
          :allocation :class
          :documentation
-         "The character represeinting this inserter style.
+         "The character representing this inserter style.
 Can't be blank, or it might be used by regular variable insertion.")
     (where :initform 'begin
            :initarg :where
            :documentation
-           "This should be 'begin or 'end, indicating where to insrt a CR.
+           "This should be 'begin or 'end, indicating where to insert a CR.
 When set to 'begin, it will insert a CR if we are not at 'bol'.
-When set to 'end it will insert a CR if we are not at 'eol'")
+When set to 'end it will insert a CR if we are not at 'eol'.")
     ;; @TODO - Add slot and control for the number of blank
     ;;         lines before and after point.
    )
@@ -407,7 +407,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
         :allocation :class
         :documentation
         "The character code used to identify inserters of this style."))
-  "Insert the value of a dictionary entry
+  "Insert the value of a dictionary entry.
 If there is no entry, insert nothing.")
 
 (defvar srecode-inserter-variable-current-dictionary nil
@@ -493,7 +493,7 @@ If SECONDNAME is nil, return VALUE."
              :documentation
              "The function used to read in the text for this prompt.")
    )
-  "Insert the value of a dictionary entry
+  "Insert the value of a dictionary entry.
 If there is no entry, prompt the user for the value to use.
 The prompt text used is derived from the previous PROMPT command in the
 template file.")
@@ -626,8 +626,8 @@ Use DICTIONARY to resolve values."
         "The character code used to identify inserters of this style.")
    )
   "Inserts the value of a dictionary variable with a specific width.
-The second argument specifies the width, and a pad, seperated by a colon.
-thus a specification of `10:left' will insert the value of A
+The second argument specifies the width, and a pad, separated by a colon.
+Thus a specification of `10:left' will insert the value of A
 to 10 characters, with spaces added to the left.  Use `right' for adding
 spaces to the right.")
 
@@ -771,7 +771,7 @@ Calls back to `srecode-insert-method-helper' for this class."
         "The character code used to identify inserters of this style.")
    (template :initarg :template
              :documentation
-             "A Template used to frame the codes from this inserter.")
+             "A template used to frame the codes from this inserter.")
    )
   "Apply values from a sub-dictionary to a template section.
 The dictionary saved at the named dictionary entry will be
@@ -806,7 +806,7 @@ Return the remains of INPUT."
         :documentation
         "The character code used to identify inserters of this style.")
    )
-  "All template segments between the secion-start and section-end
+  "All template segments between the section-start and section-end
 are treated specially.")
 
 (defmethod srecode-insert-method ((sti srecode-template-inserter-section-end)
@@ -881,7 +881,7 @@ this template instance."
               (setq active (cdr active)))
             (when (not tmpl)
               ;; If it wasn't in this context, look to see if it
-              ;; defines it's own context
+              ;; defines its own context
               (setq tmpl (srecode-template-get-table (srecode-table)
                                                      templatenamepart)))
             )
@@ -897,7 +897,7 @@ this template instance."
                                   dictionary)
   "Insert the STI inserter.
 Finds the template with this macro function part, and inserts it
-with the dictionaries found in the dictinary."
+with the dictionaries found in the dictionary."
   (srecode-insert-include-lookup sti dictionary)
   ;; Insert the template.
   ;; Our baseclass has a simple way to do this.
@@ -952,7 +952,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   "Insert the template STI.
 This will first insert the include part via inheritance, then
 insert the section it wraps into the location in the included
-template where  a ^ inserter occurs."
+template where a ^ inserter occurs."
   ;; Step 1: Look up the included inserter
   (srecode-insert-include-lookup sti dictionary)
   ;; Step 2: Temporarilly override the point inserter.