7 files changed, 39 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf6b0d4e5d5..0eb18c02cff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2009-10-01  Glenn Morris  <rgm@gnu.org>
 
+        * emacs-lisp/chart.el (chart-zap-chars, chart-bar-quickie)
+        (chart-file-count):
+        * emacs-lisp/eieio-comp.el (byte-compile-defmethod-param-convert):
+        * emacs-lisp/eieio-datadebug.el (data-debug-insert-object-button):
+        * emacs-lisp/eieio-opt.el (eieio-describe-class):
+        * emacs-lisp/eieio-speedbar.el (eieio-speedbar-create):
+        * emacs-lisp/eieio.el (defclass, eieio-defclass-autoload)
+        (eieio-copy-parents-into-subclass, make-instance, class-children)
+        (eieio-generic-form):
         * cedet/cedet-files.el (cedet-directory-name-to-file-name):
         * cedet/cedet-idutils.el (cedet-idutils-search)
         (cedet-idutils-expand-filename, cedet-idutils-support-for-directory)
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index ba7982df731..b2c3989c56e 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -1,7 +1,7 @@
 ;;; chart.el --- Draw charts (bar charts, etc)
 
-;;; Copyright (C) 1996, 1998, 1999, 2001, 2004, 2005, 2007, 2008, 2009
-;;; Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998, 1999, 2001, 2004, 2005, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam  <zappo@gnu.org>
 ;; Version: 0.2
@@ -528,7 +528,7 @@ cons cells of the form (NAME . NUM).  See SORT for more details."
           (remove-text-properties p (point) '(face))))))
 
 (defun chart-zap-chars (n)
-  "Zap up to N chars without deleteting EOLs."
+  "Zap up to N chars without deleting EOLs."
   (if (not (eobp))
       (if (< n (- (save-excursion (end-of-line) (point)) (point)))
           (delete-char n)
@@ -579,7 +579,7 @@ R1 and R2 are dotted pairs.  Colorize it with FACE."
 (defun chart-bar-quickie (dir title namelst nametitle numlst numtitle
                               &optional max sort-pred)
   "Wash over the complex eieio stuff and create a nice bar chart.
-Creat it going in direction DIR ['horizontal 'vertical] with TITLE
+Create it going in direction DIR ['horizontal 'vertical] with TITLE
 using a name sequence NAMELST labeled NAMETITLE with values NUMLST
 labeled NUMTITLE.
 Optional arguments:
@@ -619,7 +619,7 @@ SORT-PRED if desired."
 ;;; Sample utility function
 
 (defun chart-file-count (dir)
-  "Draw a chart displaying the number of different file extentions in DIR."
+  "Draw a chart displaying the number of different file extensions in DIR."
   (interactive "DDirectory: ")
   (if (not (string-match "/$" dir))
       (setq dir (concat dir "/")))
diff --git a/lisp/emacs-lisp/eieio-comp.el b/lisp/emacs-lisp/eieio-comp.el
index 8b21490e5b8..1ee314acc34 100644
--- a/lisp/emacs-lisp/eieio-comp.el
+++ b/lisp/emacs-lisp/eieio-comp.el
@@ -1,9 +1,9 @@
 ;;; eieio-comp.el -- eieio routines to help with byte compilation
 
-;;; Copyright (C) 1995,1996, 1998, 1999, 2000, 2001, 2002, 2005, 2008,
-;;; 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996, 1998, 1999, 2000, 2001, 2002, 2005, 2008,
+;;   2009  Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
 ;; Keywords: oop, lisp, tools
 
@@ -126,7 +126,7 @@ that is called but rarely.  Argument FORM is the body of the method."
 
 (defun byte-compile-defmethod-param-convert (paramlist)
   "Convert method params into the params used by the defmethod thingy.
-Argument PARAMLIST is the paramter list to convert."
+Argument PARAMLIST is the parameter list to convert."
   (let ((argfix nil))
     (while paramlist
       (setq argfix (cons (if (listp (car paramlist))
diff --git a/lisp/emacs-lisp/eieio-datadebug.el b/lisp/emacs-lisp/eieio-datadebug.el
index 0e74d5d2e55..77bf7004ac2 100644
--- a/lisp/emacs-lisp/eieio-datadebug.el
+++ b/lisp/emacs-lisp/eieio-datadebug.el
@@ -1,8 +1,8 @@
 ;;; eieio-datadebug.el --- EIEIO extensions to the data debugger.
 
-;; Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -51,7 +51,7 @@ PREFIX specifies what to insert at the start of each line."
 
 (defun data-debug-insert-object-button (object prefix prebuttontext)
   "Insert a button representing OBJECT.
-PREFIX is the text that preceeds the button.
+PREFIX is the text that precedes the button.
 PREBUTTONTEXT is some text between PREFIX and the object button."
   (let ((start (point))
         (end nil)
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 846ea61da34..12fd666f415 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -1,9 +1,9 @@
 ;;; eieio-opt.el -- eieio optional functions (debug, printing, speedbar)
 
-;;; Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005,
-;;; 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2008,
+;;   2009  Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
 ;; Keywords: OO, lisp
 
@@ -75,7 +75,7 @@ Argument CH-PREFIX is another character prefix to display."
 
 (defun eieio-describe-class (class &optional headerfcn)
   "Describe a CLASS defined by a string or symbol.
-If CLASS is actually an object, then also display current values of that obect.
+If CLASS is actually an object, then also display current values of that object.
 Optional HEADERFCN should be called to insert a few bits of info first."
   (interactive (list (eieio-read-class "Class: ")))
   (with-output-to-temp-buffer (help-buffer) ;"*Help*"
diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index 3a1995a773c..8eb0a919a0b 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009
 ;;   Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
 ;; Keywords: OO, tools
 
@@ -77,9 +77,9 @@
 ;;    string.   This will automatically handle cases when speedbar is
 ;;    not already loaded, and specifying all overload functions.
 ;;
-;; 5) Create an initliazer function which looks like this:
+;; 5) Create an initializer function which looks like this:
 ;;
-;; (defun my-speedbar-mode-initilaize ()
+;; (defun my-speedbar-mode-initialize ()
 ;;   "documentation"
 ;;   (interactive)
 ;;   (speedbar-frame-mode 1)
@@ -136,8 +136,8 @@
   "Create a speedbar mode for displaying an object hierarchy.
 MAP-FN is the keymap generator function used for extra keys.
 MAP-VAR is the keymap variable used.
-MENU-VAR is the symbol containting an easymenu compatible menu part to use.
-MODENAME is a s tring used to identify this browser mode.
+MENU-VAR is the symbol containing an easymenu compatible menu part to use.
+MODENAME is a string used to identify this browser mode.
 FETCHER is a generic function used to fetch the base object list used when
 creating the speedbar display."
   (if (not (featurep 'speedbar))
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 60a8cef36ce..f9ac09001c6 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1,10 +1,10 @@
 ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects
 ;;;              or maybe Eric's Implementation of Emacs Intrepreted Objects
 
-;;; Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
-;;; 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
 ;; Keywords: OO, lisp
 
@@ -307,7 +307,7 @@ Options added to EIEIO:
                         If a string, use as an error string if someone does
                         try to make an instance.
   :method-invocation-order
-                      - Control the method invokation order if there is
+                      - Control the method invocation order if there is
                         multiple inheritance.  Valid values are:
                          :breadth-first - The default.
                          :depth-first
@@ -333,7 +333,7 @@ wish, and reference them using the function `class-option'."
 ;;;###autoload
 (defun eieio-defclass-autoload (cname superclasses filename doc)
   "Create autoload symbols for the EIEIO class CNAME.
-SUPERCLASSES are the superclasses that CNAME inherites from.
+SUPERCLASSES are the superclasses that CNAME inherits from.
 DOC is the docstring for CNAME.
 This function creates a mock-class for CNAME and adds it into
 SUPERCLASSES as children.
@@ -1020,7 +1020,7 @@ if default value is nil."
 
 (defun eieio-copy-parents-into-subclass (newc parents)
   "Copy into NEWC the slots of PARENTS.
-Follow the rules of not overwritting early parents when applying to
+Follow the rules of not overwriting early parents when applying to
 the new child class."
   (let ((ps (aref newc class-parent))
         (sn (class-option-assoc (aref newc class-options)
@@ -1101,7 +1101,7 @@ for each slot.  For example:
 
   (make-instance 'foo :slot1 value1 :slotN valueN)
 
-Compatability note:
+Compatibility note:
 
 If the first element of INITARGS is a string, it is used as the
 name of the class.
@@ -1615,7 +1615,7 @@ The CLOS function `class-direct-superclasses' is aliased to this function."
   `(aref (class-v ,class) class-children))
 
 (defun class-children (class)
-"Return child classses to CLASS.
+"Return child classes to CLASS.
 
 The CLOS function `class-direct-subclasses' is aliased to this function."
   (if (not (class-p class)) (signal 'wrong-type-argument (list 'class-p class)))
@@ -2274,7 +2274,7 @@ function performs no type checking!"
 If CLASS is not a class then use `generic' instead.  If class has no
 form, but has a parent class, then trace to that parent class.  The
 first time a form is requested from a symbol, an optimized path is
-memoized for future faster use."
+memorized for future faster use."
  (let ((emto (aref (get method 'eieio-method-obarray)
                    (if class key (+ key 3)))))
    (if (class-p class)