diff options
| author | Chong Yidong | 2007-06-01 13:47:44 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-06-01 13:47:44 +0000 |
| commit | f7e5609497aa37b9068f7edf5c9b6b892bcc56ca (patch) | |
| tree | 24583235267859c1dcdbac008310149fe8ba0698 | |
| parent | c26953683cd59a6b21d03df908362b211dec07a2 (diff) | |
| download | emacs-f7e5609497aa37b9068f7edf5c9b6b892bcc56ca.tar.gz emacs-f7e5609497aa37b9068f7edf5c9b6b892bcc56ca.zip | |
(show-paren-function): Undo 2007-04-19 and 2007-04-20 changes.
| -rw-r--r-- | lisp/paren.el | 9 |
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." | |||
| 143 | (let ((oldpos (point)) | 143 | (let ((oldpos (point)) |
| 144 | (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1) | 144 | (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1) |
| 145 | ((eq (syntax-class (syntax-after (point))) 4) 1))) | 145 | ((eq (syntax-class (syntax-after (point))) 4) 1))) |
| 146 | (window-start (window-start)) | ||
| 147 | pos mismatch face) | 146 | pos mismatch face) |
| 148 | ;; | 147 | ;; |
| 149 | ;; Find the other end of the sexp. | 148 | ;; Find the other end of the sexp. |
| @@ -248,13 +247,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time." | |||
| 248 | ;; | 247 | ;; |
| 249 | ;; Always set the overlay face, since it varies. | 248 | ;; Always set the overlay face, since it varies. |
| 250 | (overlay-put show-paren-overlay 'priority show-paren-priority) | 249 | (overlay-put show-paren-overlay 'priority show-paren-priority) |
| 251 | (overlay-put show-paren-overlay 'face face)) | 250 | (overlay-put show-paren-overlay 'face face))) |
| 252 | ;; If there are continued lines, the above operations can | ||
| 253 | ;; force redisplay to recenter the window (since there is no | ||
| 254 | ;; way for it to know that the overlay changes to the buffer | ||
| 255 | ;; are harmless). So reset the window-start. | ||
| 256 | (unless (window-minibuffer-p) | ||
| 257 | (set-window-start (selected-window) window-start))) | ||
| 258 | ;; show-paren-mode is nil in this buffer. | 251 | ;; show-paren-mode is nil in this buffer. |
| 259 | (and show-paren-overlay | 252 | (and show-paren-overlay |
| 260 | (delete-overlay show-paren-overlay)) | 253 | (delete-overlay show-paren-overlay)) |