From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 28 Dec 2013 06:37:35 +0000 (-0800)
Subject: Spelling and typo fixes.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~148
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e99158aac0347f62647618200fc5d90681cd2e9;p=emacs.git

Spelling and typo fixes.
---

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 458d8741ac8..10b07af1f59 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -421,7 +421,7 @@ A prefix argument means don't query; expand all abbrevs."
 \(fn ABBREV PROP)")
 
 (defalias 'abbrev-put 'put
-  "Set the property PROP of abbrev ABREV to value VAL.
+  "Set the property PROP of abbrev ABBREV to value VAL.
 See `define-abbrev' for the effect of some special properties.
 
 \(fn ABBREV PROP VAL)")
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index f3832004751..1691fbbfec3 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -92,8 +92,8 @@ closer."
 
 The default values of `electric-pair-inhibit-predicate' and
 `electric-pair-skip-self' check this variable before delegating to other
-predicates reponsible for making decisions on whether to pair/skip some
-characters based on the actual state of the buffer's parenthesis and
+predicates responsible for making decisions on whether to pair/skip some
+characters based on the actual state of the buffer's parentheses and
 quotes."
   :version "24.4"
   :group 'electricity
@@ -274,17 +274,17 @@ when to fallback to `parse-partial-sexp'."
 ;; doesn't keep `electric-pair-mode' from balancing your ()'s and your
 ;; []'s.
 (defun electric-pair--balance-info (direction string-or-comment)
-  "Examine lists forward or backward according to DIRECTIONS's sign.
+  "Examine lists forward or backward according to DIRECTION's sign.
 
 STRING-OR-COMMENT is info suitable for running `parse-partial-sexp'.
 
-Return a cons of two descritions (MATCHED-P . PAIR) for the
+Return a cons of two descriptions (MATCHED-P . PAIR) for the
 innermost and outermost lists that enclose point. The outermost
 list enclosing point is either the first top-level or first
-mismatched list found by uplisting.
+mismatched list found by listing up.
 
 If the outermost list is matched, don't rely on its PAIR. If
-point is not enclosed by any lists, return ((T) (T))."
+point is not enclosed by any lists, return ((T) . (T))."
   (let* (innermost
          outermost
          (table (if string-or-comment
diff --git a/test/automated/electric-tests.el b/test/automated/electric-tests.el
index 830b61e5004..86a2694fa43 100644
--- a/test/automated/electric-tests.el
+++ b/test/automated/electric-tests.el
@@ -186,7 +186,7 @@ Should %s \"%s\" and point at %d"
                    bindings
                    fixture-fn))))))
 
-;;; Basic pairings and skippings
+;;; Basic pairs and skips
 ;;;
 (define-electric-pair-test balanced-situation
   " (())  " "(((((((" :skip-pair-string "ppppppp"
@@ -237,7 +237,7 @@ Should %s \"%s\" and point at %d"
 (define-electric-pair-test find-matching-different-paren-type-inside-list
   "( ()]) " "-[-----" :skip-pair-string "-------")
 
-(define-electric-pair-test ignore-different-unmatching-paren-type
+(define-electric-pair-test ignore-different-nonmatching-paren-type
   "( ()]) " "-(-----" :skip-pair-string "-p-----")
 
 (define-electric-pair-test autopair-keep-least-amount-of-mixed-unbalance