* lisp/simple.el (blink-matching-open): Obey forward-sexp-function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce5baa1b1a1a8211eaf6d28811e1997aacb1924d..0d8c1304e6ce285098bfb1805404e68289ed997a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (blink-matching-open): Obey forward-sexp-function.
+
 2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (prog-mode-map): New var.

diff --git a/lisp/simple.el b/lisp/simple.el
index 7c941fd63b94fc15e037223b5706948a14c4965c..b998eef88a05a64d56de08449ae6300e76db417f 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5495,7 +5495,9 @@ it skips the contents of comments that end before point."
                        (and parse-sexp-ignore-comments
                             (not blink-matching-paren-dont-ignore-comments))))
                   (condition-case ()
-                      (scan-sexps oldpos -1)
+                      (progn
+                        (forward-sexp -1)
+                        (point))
                     (error nil))))))
           (matching-paren
             (and blinkpos