aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olson2008-10-08 05:03:43 +0000
committerMichael Olson2008-10-08 05:03:43 +0000
commit5412419465dbb3e12d0841ab15875fa34ca6f336 (patch)
treed1a2dfc81d2475ff2fb015c6d4fec5f2676e6baa
parent1c86baa408007e4ab3774ebdb53e620eacb7a4c1 (diff)
downloademacs-5412419465dbb3e12d0841ab15875fa34ca6f336.tar.gz
emacs-5412419465dbb3e12d0841ab15875fa34ca6f336.zip
ibuffer: Fix issue with ERC scroll-to-bottom (Bug #858).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/ibuffer.el3
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34540d598d2..94ffd1fab54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-10-08 Michael Olson <mwolson@gnu.org>
2
3 * ibuffer.el (ibuffer-shrink-to-fit): Force redisplay, so that we
4 can avoid a bad interaction with programs that add functions to
5 the window-scroll-functions hook. This fixes Bug #858.
6
12008-10-07 Chong Yidong <cyd@stupidchicken.com> 72008-10-07 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * startup.el (command-line): Use display-warning to warn about an 9 * startup.el (command-line): Use display-warning to warn about an
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 539f88ec3c1..262f2ad73ab 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1153,6 +1153,9 @@ a new window in the current frame, splitting vertically."
1153 (ibuffer-redisplay t))) 1153 (ibuffer-redisplay t)))
1154 1154
1155(defun ibuffer-shrink-to-fit (&optional owin) 1155(defun ibuffer-shrink-to-fit (&optional owin)
1156 ;; Make sure that redisplay is performed, otherwise there can be a
1157 ;; bad interaction with code in the window-scroll-functions hook
1158 (redisplay t)
1156 (fit-window-to-buffer nil (when owin (/ (frame-height) 1159 (fit-window-to-buffer nil (when owin (/ (frame-height)
1157 (length (window-list (selected-frame))))))) 1160 (length (window-list (selected-frame)))))))
1158 1161