diff lisp/simple.el @ 110000:757182d1d4cb

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 19 Aug 2010 22:47:51 +0000
parents c39af0d0a834
children 53205019b195
line wrap: on
line diff
--- a/lisp/simple.el	Thu Aug 19 00:35:46 2010 +0000
+++ b/lisp/simple.el	Thu Aug 19 22:47:51 2010 +0000
@@ -5495,7 +5495,9 @@
                        (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