From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 11 Mar 2002 09:14:28 +0000 (+0000)
Subject: (show-paren-function): Move back in other direction
X-Git-Tag: ttn-vms-21-2-B4~16235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6be7b1272d4ff15bb13fbd3110217777706d0f6a;p=emacs.git

(show-paren-function): Move back in other direction
to verify the match is correct.
---

diff --git a/lisp/paren.el b/lisp/paren.el
index fa68e26203f..000854a01d2 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -155,6 +155,14 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 	      (condition-case ()
 		  (setq pos (scan-sexps (point) dir))
 		(error (setq pos t mismatch t)))
+	      ;; Move back the other way and verify we get back to the
+	      ;; starting point.  If not, these two parens don't really match.
+	      ;; Maybe the one at point is escaped and doesn't really count.
+	      (when (integerp pos)
+		(unless (condition-case ()
+			    (eq (point) (scan-sexps pos (- dir)))
+			  (error nil))
+		  (setq pos nil)))
 	      ;; If found a "matching" paren, see if it is the right
 	      ;; kind of paren to match the one we started at.
 	      (when (integerp pos)