(show-paren-function): Undo 2007-04-19 and 2007-04-20 changes.

diff --git a/lisp/paren.el b/lisp/paren.el
index 38ac150b40225a91f95e8a182232eb5330d3862a..95f718d568334ec68d26a40c00c67bc0981bd70c 100644 (file)
--- 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))