aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2010-08-19 11:37:40 +0200
committerStefan Monnier2010-08-19 11:37:40 +0200
commit4b9c0a498d25344ac6da4e67375f853e438a102a (patch)
treedc1c7488c86902f102eddd670608572b3610b941
parent96fa1768839e3a9aa5ab5f2b782cea376460df9d (diff)
downloademacs-4b9c0a498d25344ac6da4e67375f853e438a102a.tar.gz
emacs-4b9c0a498d25344ac6da4e67375f853e438a102a.zip
* lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
-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 @@
12010-08-19 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * simple.el (blink-matching-open): Obey forward-sexp-function.
4
12010-08-18 Stefan Monnier <monnier@iro.umontreal.ca> 52010-08-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * simple.el (prog-mode-map): New var. 7 * 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."
5495 (and parse-sexp-ignore-comments 5495 (and parse-sexp-ignore-comments
5496 (not blink-matching-paren-dont-ignore-comments)))) 5496 (not blink-matching-paren-dont-ignore-comments))))
5497 (condition-case () 5497 (condition-case ()
5498 (scan-sexps oldpos -1) 5498 (progn
5499 (forward-sexp -1)
5500 (point))
5499 (error nil)))))) 5501 (error nil))))))
5500 (matching-paren 5502 (matching-paren
5501 (and blinkpos 5503 (and blinkpos