Merge from trunk.

12 files changed, 25 insertions, 25 deletions

diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 052999bf7c8..d3623d6022f 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -62,11 +62,11 @@
    (dictionary :initarg :dictionary
 	       :type (or null srecode-dictionary)
 	       :documentation
-	       "List of section dictinaries.
+	       "List of section dictionaries.
 The compiled template can contain lists of section dictionaries,
 or values that are expected to be passed down into different
 section macros.  The template section dictionaries are merged in with
-any incomming dictionaries values.")
+any incoming dictionaries values.")
    (binding :initarg :binding
 	    :documentation
 	    "Preferred keybinding for this template in `srecode-minor-mode-map'.")
@@ -552,7 +552,7 @@ A list of defined variables VARS provides a variable table."
 	  (when (not hs)
 	    (setq hs (make-hash-table :test 'equal :size 20))
 	    (puthash context hs contexthash))
-	  ;; Put into that contenxt's hash.
+	  ;; Put into that context's hash.
 	  (puthash objname (car lp) hs)
 	  )
 
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index cae52428e75..11d84e96f41 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -64,7 +64,7 @@ Some useful context values used by the provided srecode templates are:
      \"comment\"  - In a comment in a block of code
      -- these items show up at the end of the context list. --
      \"public\", \"protected\", \"private\" -
-                  In or near a section of public/pritected/private entries.
+                  In or near a section of public/protected/private entries.
   \"code\" - In a block of code.
      \"string\" - In a string in a block of code
      \"comment\"  - In a comment in a block of code
@@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are:
   )
 
 (defun srecode-calculate-nearby-things ()
-  ;; NOTE: May need to add bounes to this FCN
+  ;; NOTE: May need to add bounds to this FCN
   "Calculate the CONTEXT type items nearby the current point.
 Assume that what we want to insert next is based on what is just
 before point.  If there is nothing, then assume it is whatever is
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 521532bed33..62ceff82448 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -202,7 +202,7 @@ associated with a buffer or parent."
 					      :size 20)
 		   :origin   origin)))
 	;; Only set up the default variables if we are being built
-	;; directroy for a particular buffer.
+	;; directly for a particular buffer.
 	(when initfrombuff
 	  ;; Variables from the table we are inserting from.
 	  ;; @todo - get a better tree of tables.
@@ -280,7 +280,7 @@ inserted dictionaries."
 	  (progn
 	    (srecode-dictionary-show-section new "FIRST")
 	    (srecode-dictionary-show-section new "LAST"))
-	;; Not the very first one.  Lets clean up CAR.
+	;; Not the very first one.  Let's clean up CAR.
 	(let ((tail (car (last ov))))
 	  (srecode-dictionary-hide-section tail "LAST")
 	  (srecode-dictionary-show-section tail "NOTLAST")
@@ -436,7 +436,7 @@ The root dictionary is usually for a current or active insertion."
 
 ;;; COMPOUND VALUE METHODS
 ;;
-;; Compound values must provide at least the toStriong method
+;; Compound values must provide at least the toString method
 ;; for use in converting the compound value into sometehing insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index a52cadbfb2c..134b5310ab3 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -122,7 +122,7 @@ RESULT is a string."
     ("read" . "Reads from")
     ("reset" . "Resets the parameters and returns")
     ("scan" . "Scans the ")
-    ("setup\\|init\\(iallize\\)?" . "Initializes the ")
+    ("setup\\|init\\(ialize\\)?" . "Initializes the ")
     ("select" . "Chooses the ")
     ("send" . "Sends a")
     ("re?c\\(v\\|ieves?\\)" . "Receives a ")
@@ -167,7 +167,7 @@ doesn't always work correctly."
     ("str\\(ing\\)?" . "string")
     ("use?r" . "user")
     ("num\\(ber\\)?" . "number")
-    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable
+    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable
     )
   "List of common English abbreviations or full words.
 These are nouns (as opposed to verbs) for use in creating expanded
@@ -720,7 +720,7 @@ allocating something based on its type."
   "Convert tag or string PARAM into a name,comment pair.
 Optional COMMENTLIST is list of previously existing comments to
 use instead in alist form.  If the name doesn't appear in the list of
-standard names, then englishify it instead."
+standard names, then english it instead."
   (let ((cmt "")
 	(aso srecode-document-autocomment-param-alist)
 	(fnd nil)
@@ -811,8 +811,8 @@ not account for verb parts."
 	    (if (string-match (car (car al)) (downcase ts))
 		(progn
 		  (setq newstr (concat newstr (cdr (car al))))
-		  ;; don't terminate because we may actuall have 2 words
-		  ;; next to eachother we didn't identify before
+		  ;; don't terminate because we may actually have 2 words
+		  ;; next to each other we didn't identify before
 		  (setq llow t)))
 	    (setq al (cdr al)))
 	  (if (not llow) (setq newstr (concat newstr ts)))
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 80e6f9d8d1c..d87dc315829 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -61,7 +61,7 @@
   (oset st lastdict dict))
 
 (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state))
-  "Reset the achor point on extract state ST."
+  "Reset the anchor point on extract state ST."
   (oset st anchor (point)))
 
 (defmethod srecode-extract-state-extract ((st srecode-extract-state)
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 088781cfb53..f13fb17ca8f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -101,7 +101,7 @@ Has virtual :start and :end initializers.")
 	    ))
 
     ;; Create a temporary overlay now.  We have to use an overlay and
-    ;; not a marker becaues of the in-front insertion rules.  The rules
+    ;; not a marker because of the in-front insertion rules.  The rules
     ;; are backward from what is wanted while typing.
     (setq olay (make-overlay start end (current-buffer) t nil))
     (overlay-put olay 'srecode-init-only t)
@@ -338,7 +338,7 @@ PRE-LEN is used in the after mode for the length of the changed text."
 	   (inhibit-modification-hooks t)
 	   )
       ;; Sometimes a field is deleted, but we might still get a stray
-      ;; event.  Lets just ignore those events.
+      ;; event.  Let's just ignore those events.
       (when (slot-boundp field 'overlay)
 	;; First, fixup the two overlays, in case they got confused.
 	(let ((main (oref field overlay))
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index fdca64a7da1..b947c63f4dd 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -103,7 +103,7 @@ If TAB is nil, then always return t."
   (let ((proj (oref tab :project)))
     ;; Return t if the project wasn't set.
     (if (not proj) t
-      ;; If the project directory was set, lets check it.
+      ;; If the project directory was set, let's check it.
       (let ((dd (expand-file-name default-directory))
 	    (projexp (regexp-quote (directory-file-name proj))))
 	(if (string-match (concat "^" projexp) dd)
@@ -238,7 +238,7 @@ Optional argument HASH is the hash table to fill in."
 	   (tabs (when mt (oref mt :tables)))
 	   )
       (while tabs
-	;; Exclude templates for a perticular application.
+	;; Exclude templates for a particular application.
 	(when (and (not (oref (car tabs) :application))
 		   (srecode-template-table-in-project-p (car tabs)))
 	  (maphash (lambda (key temp)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 84964a9e8b4..60f277b2c9f 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -255,7 +255,7 @@ ST can be a class, or an object."
       (let ((c (oref st code)))
 	(srecode-push st)
 	(srecode-insert-code-stream c dictionary))
-    ;; Poping the stack is protected
+    ;; Popping the stack is protected.
     (srecode-pop st)))
 
 (defun srecode-insert-code-stream (code dictionary)
@@ -936,7 +936,7 @@ with the dictionaries found in the dictionary."
   (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name))
       ;; If we have a value, then call the next method
       (srecode-insert-method-helper sti dictionary 'includedtemplate)
-    ;; If we don't have a special dictitonary, then just insert with the
+    ;; If we don't have a special dictionary, then just insert with the
     ;; current dictionary.
     (srecode-insert-subtemplate sti dictionary 'includedtemplate))
   )
@@ -946,7 +946,7 @@ with the dictionaries found in the dictionary."
 ;; It will first insert the included template, then insert the embedded
 ;; template wherever the $^$ in the included template was.
 ;;
-;; Since it uses dual inheretance, it will magically get the end-matching
+;; Since it uses dual inheritance, it will magically get the end-matching
 ;; behavior of #, with the including feature of >.
 ;;
 (defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start)
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index bb2db79acc6..23d09bc9a4b 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -61,7 +61,7 @@
 	(define-key km (format "%c" k) 'srecode-bind-insert)
 	(setq k (1+ k))))
     km)
-  "Keymap used behind the srecode prefix key in in srecode minor mode.")
+  "Keymap used behind the srecode prefix key in srecode minor mode.")
 
 (defvar srecode-menu-bar
   (list
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 4a1a15c1d12..956bdfbd97a 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -394,7 +394,7 @@ as `function' will leave point where code might be inserted."
 	(srecode-semantic-apply-tag-to-dict tagobj dict)))
 
     ;; Insert dict-entries into the dictionary LAST so that previous
-    ;; items can be overriden.
+    ;; items can be overridden.
     (let ((entries dict-entries))
       (while entries
 	(srecode-dictionary-set-value dict
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 5a407aad135..0a99b7869e8 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -483,7 +483,7 @@ section or ? for an ask variable."
 
 	(if (> start (point))
 	    ;; If our starting point is after the found point, that
-	    ;; means we are not inside the macro.  Retur nil.
+	    ;; means we are not inside the macro.  Return nil.
 	    nil
 	  ;; We are inside the macro, extract the text so far.
 	  (let* ((macroend (match-beginning 0))
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 33440d04432..acfc2486711 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -231,7 +231,7 @@ This is to take advantage of TeXinfo's markup symbols."
     (if buffer
 	(progn (set-buffer buffer)
 	       (srecode-texi-texify-docstring string))
-      ;; Else, no buffer, so lets do something else
+      ;; Else, no buffer, so let's do something else
       (with-mode-local texinfo-mode
 	(srecode-texi-texify-docstring string)))))