From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 3 Dec 2004 00:06:21 +0000 (+0000)
Subject: (show-paren-function): Check for matching chars specified by text props.
X-Git-Tag: ttn-vms-21-2-B4~3461
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f27dfeb0dc7fdbfaf974fa42f5277e47d283e14;p=emacs.git

(show-paren-function): Check for matching chars specified by text props.
---

diff --git a/lisp/paren.el b/lisp/paren.el
index e654cc2cc10..bc5c2f1f007 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -171,9 +171,11 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 		(let ((beg (min pos oldpos)) (end (max pos oldpos)))
 		  (when (/= (char-syntax (char-after beg)) ?\$)
 		    (setq mismatch
-			  (not (eq (char-before end)
+			  (not (eq (or (cdr (get-text-property (1- end) 'syntax-table))
+				       (char-before end))
 				   ;; This can give nil.
-				   (matching-paren (char-after beg)))))))))))
+				   (or (cdr (get-text-property beg 'syntax-table))
+				       (matching-paren (char-after beg))))))))))))
 	;;
 	;; Highlight the other end of the sexp, or unhighlight if none.
 	(if (not pos)