aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-07-10 14:41:47 +0200
committerMartin Rudalics2011-07-10 14:41:47 +0200
commit54aa8874cc3641b8c54ee0376f90a10736d7eceb (patch)
treefbbdc8e435bb4aaea917ad9e61a1ba1b75974117
parentb95799f2ce4d7a38277f60c9f7818afd5f513f31 (diff)
downloademacs-54aa8874cc3641b8c54ee0376f90a10736d7eceb.tar.gz
emacs-54aa8874cc3641b8c54ee0376f90a10736d7eceb.zip
Revert last change of display-buffer-normalize-default.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/window.el2
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0455172282..23aaf167666 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,3 @@
12011-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
72011-07-10 Bob Rogers <rogers@rgrjr.dyndns.org> 12011-07-10 Bob Rogers <rogers@rgrjr.dyndns.org>
8 2
9 * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256). 3 * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256).
diff --git a/lisp/window.el b/lisp/window.el
index 21fced0eabf..999e408bdb1 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 even-window-heights) 5350 (not 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