summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2007-06-01 13:47:44 +0000
committerChong Yidong <cyd@stupidchicken.com>2007-06-01 13:47:44 +0000
commitf7e5609497aa37b9068f7edf5c9b6b892bcc56ca (patch)
tree24583235267859c1dcdbac008310149fe8ba0698
parentc26953683cd59a6b21d03df908362b211dec07a2 (diff)
downloademacs-f7e5609497aa37b9068f7edf5c9b6b892bcc56ca.tar.gz
(show-paren-function): Undo 2007-04-19 and 2007-04-20 changes.
-rw-r--r--lisp/paren.el9
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/paren.el b/lisp/paren.el
index 38ac150b402..95f718d5683 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -143,7 +143,6 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
(let ((oldpos (point))
(dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
((eq (syntax-class (syntax-after (point))) 4) 1)))
- (window-start (window-start))
pos mismatch face)
;;
;; Find the other end of the sexp.
@@ -248,13 +247,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
;;
;; Always set the overlay face, since it varies.
(overlay-put show-paren-overlay 'priority show-paren-priority)
- (overlay-put show-paren-overlay 'face face))
- ;; If there are continued lines, the above operations can
- ;; force redisplay to recenter the window (since there is no
- ;; way for it to know that the overlay changes to the buffer
- ;; are harmless). So reset the window-start.
- (unless (window-minibuffer-p)
- (set-window-start (selected-window) window-start)))
+ (overlay-put show-paren-overlay 'face face)))
;; show-paren-mode is nil in this buffer.
(and show-paren-overlay
(delete-overlay show-paren-overlay))