diff options
| author | Martin Rudalics | 2011-07-10 12:19:47 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2011-07-10 12:19:47 +0200 |
| commit | b95799f2ce4d7a38277f60c9f7818afd5f513f31 (patch) | |
| tree | 9ca88bfde28aabe7ce0acb99cafa8a8350d1fd85 | |
| parent | 268c2c36f4f0239d4c1da45d76c9d7f0cf4cb8dd (diff) | |
| download | emacs-b95799f2ce4d7a38277f60c9f7818afd5f513f31.tar.gz emacs-b95799f2ce4d7a38277f60c9f7818afd5f513f31.zip | |
Don't invert meaning of even-window-heights in display-buffer-normalize-default.
* window.el (display-buffer-normalize-default): Don't invert
meaning of even-window-heights. Reported by Eli Zaretskii
<eliz@gnu.org>.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/window.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 23aaf167666..a0455172282 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-07-10 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.el (display-buffer-normalize-default): Don't invert | ||
| 4 | meaning of even-window-heights. Reported by Eli Zaretskii | ||
| 5 | <eliz@gnu.org>. | ||
| 6 | |||
| 1 | 2011-07-10 Bob Rogers <rogers@rgrjr.dyndns.org> | 7 | 2011-07-10 Bob Rogers <rogers@rgrjr.dyndns.org> |
| 2 | 8 | ||
| 3 | * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256). | 9 | * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256). |
diff --git a/lisp/window.el b/lisp/window.el index 999e408bdb1..21fced0eabf 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -5347,7 +5347,7 @@ buffer display specifiers." | |||
| 5347 | 5347 | ||
| 5348 | ;; `even-window-heights' | 5348 | ;; `even-window-heights' |
| 5349 | (unless (and (boundp 'even-window-heights) | 5349 | (unless (and (boundp 'even-window-heights) |
| 5350 | (not even-window-heights)) | 5350 | even-window-heights) |
| 5351 | (setq specifiers | 5351 | (setq specifiers |
| 5352 | (cons (cons 'reuse-window-even-sizes t) specifiers))) | 5352 | (cons (cons 'reuse-window-even-sizes t) specifiers))) |
| 5353 | 5353 | ||