summaryrefslogtreecommitdiff
path: root/lisp/paren.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-12-06 19:06:12 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-12-06 19:06:12 +0000
commit96bda29d36fe90e894d6acb4f87d8933fecd2a46 (patch)
tree9ea1898b0e086a46dd1bd990a57f91053ac6e3c7 /lisp/paren.el
parente7a4820cac74a73e62a42dd623da3b8473c845cc (diff)
downloademacs-96bda29d36fe90e894d6acb4f87d8933fecd2a46.tar.gz
(show-paren-function): Fix last change (2004-12-02).
Diffstat (limited to 'lisp/paren.el')
-rw-r--r--lisp/paren.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/paren.el b/lisp/paren.el
index bc5c2f1f007..63300ce6238 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -169,13 +169,14 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
;; kind of paren to match the one we started at.
(when (integerp pos)
(let ((beg (min pos oldpos)) (end (max pos oldpos)))
- (when (/= (char-syntax (char-after beg)) ?\$)
+ (unless (eq (car (syntax-after beg)) 8) ;Not syntax `$'.
(setq mismatch
- (not (eq (or (cdr (get-text-property (1- end) 'syntax-table))
- (char-before end))
- ;; This can give nil.
- (or (cdr (get-text-property beg 'syntax-table))
- (matching-paren (char-after beg))))))))))))
+ (not (or (eq (char-before end)
+ ;; This can give nil.
+ (cdr (syntax-after beg)))
+ (eq (char-after beg)
+ ;; This can give nil.
+ (cdr (syntax-after (1- end)))))))))))))
;;
;; Highlight the other end of the sexp, or unhighlight if none.
(if (not pos)