*** empty log message ***

[bpt/emacs.git] / lisp / paren.el

diff --git a/lisp/paren.el b/lisp/paren.el
index 38ac150..db8da41 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,7 +1,7 @@
 ;;; paren.el --- highlight matching paren
 
 ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -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))