summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-08-19 11:37:40 +0200
committerStefan Monnier <monnier@iro.umontreal.ca>2010-08-19 11:37:40 +0200
commit4b9c0a498d25344ac6da4e67375f853e438a102a (patch)
treedc1c7488c86902f102eddd670608572b3610b941 /lisp
parent96fa1768839e3a9aa5ab5f2b782cea376460df9d (diff)
downloademacs-4b9c0a498d25344ac6da4e67375f853e438a102a.tar.gz
* lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce5baa1b1a1..0d8c1304e6c 100644
--- 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 7c941fd63b9..b998eef88a0 100644
--- 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