aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-12-27 22:37:35 -0800
committerPaul Eggert2013-12-27 22:37:35 -0800
commit7e99158aac0347f62647618200fc5d90681cd2e9 (patch)
tree437b0c6b1cf27a5526299399ba8b0e6d839c22bd
parent4364185f73c426c17de2892d41992f080c6d433c (diff)
downloademacs-7e99158aac0347f62647618200fc5d90681cd2e9.tar.gz
emacs-7e99158aac0347f62647618200fc5d90681cd2e9.zip
Spelling and typo fixes.
-rw-r--r--lisp/abbrev.el2
-rw-r--r--lisp/elec-pair.el12
-rw-r--r--test/automated/electric-tests.el4
3 files changed, 9 insertions, 9 deletions
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."
421\(fn ABBREV PROP)") 421\(fn ABBREV PROP)")
422 422
423(defalias 'abbrev-put 'put 423(defalias 'abbrev-put 'put
424 "Set the property PROP of abbrev ABREV to value VAL. 424 "Set the property PROP of abbrev ABBREV to value VAL.
425See `define-abbrev' for the effect of some special properties. 425See `define-abbrev' for the effect of some special properties.
426 426
427\(fn ABBREV PROP VAL)") 427\(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."
92 92
93The default values of `electric-pair-inhibit-predicate' and 93The default values of `electric-pair-inhibit-predicate' and
94`electric-pair-skip-self' check this variable before delegating to other 94`electric-pair-skip-self' check this variable before delegating to other
95predicates reponsible for making decisions on whether to pair/skip some 95predicates responsible for making decisions on whether to pair/skip some
96characters based on the actual state of the buffer's parenthesis and 96characters based on the actual state of the buffer's parentheses and
97quotes." 97quotes."
98 :version "24.4" 98 :version "24.4"
99 :group 'electricity 99 :group 'electricity
@@ -274,17 +274,17 @@ when to fallback to `parse-partial-sexp'."
274;; doesn't keep `electric-pair-mode' from balancing your ()'s and your 274;; doesn't keep `electric-pair-mode' from balancing your ()'s and your
275;; []'s. 275;; []'s.
276(defun electric-pair--balance-info (direction string-or-comment) 276(defun electric-pair--balance-info (direction string-or-comment)
277 "Examine lists forward or backward according to DIRECTIONS's sign. 277 "Examine lists forward or backward according to DIRECTION's sign.
278 278
279STRING-OR-COMMENT is info suitable for running `parse-partial-sexp'. 279STRING-OR-COMMENT is info suitable for running `parse-partial-sexp'.
280 280
281Return a cons of two descritions (MATCHED-P . PAIR) for the 281Return a cons of two descriptions (MATCHED-P . PAIR) for the
282innermost and outermost lists that enclose point. The outermost 282innermost and outermost lists that enclose point. The outermost
283list enclosing point is either the first top-level or first 283list enclosing point is either the first top-level or first
284mismatched list found by uplisting. 284mismatched list found by listing up.
285 285
286If the outermost list is matched, don't rely on its PAIR. If 286If the outermost list is matched, don't rely on its PAIR. If
287point is not enclosed by any lists, return ((T) (T))." 287point is not enclosed by any lists, return ((T) . (T))."
288 (let* (innermost 288 (let* (innermost
289 outermost 289 outermost
290 (table (if string-or-comment 290 (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"
186 bindings 186 bindings
187 fixture-fn)))))) 187 fixture-fn))))))
188 188
189;;; Basic pairings and skippings 189;;; Basic pairs and skips
190;;; 190;;;
191(define-electric-pair-test balanced-situation 191(define-electric-pair-test balanced-situation
192 " (()) " "(((((((" :skip-pair-string "ppppppp" 192 " (()) " "(((((((" :skip-pair-string "ppppppp"
@@ -237,7 +237,7 @@ Should %s \"%s\" and point at %d"
237(define-electric-pair-test find-matching-different-paren-type-inside-list 237(define-electric-pair-test find-matching-different-paren-type-inside-list
238 "( ()]) " "-[-----" :skip-pair-string "-------") 238 "( ()]) " "-[-----" :skip-pair-string "-------")
239 239
240(define-electric-pair-test ignore-different-unmatching-paren-type 240(define-electric-pair-test ignore-different-nonmatching-paren-type
241 "( ()]) " "-(-----" :skip-pair-string "-p-----") 241 "( ()]) " "-(-----" :skip-pair-string "-p-----")
242 242
243(define-electric-pair-test autopair-keep-least-amount-of-mixed-unbalance 243(define-electric-pair-test autopair-keep-least-amount-of-mixed-unbalance