Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri@jurta.org.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index feed5157c8a630d8586acaa04de8000c4a194a8a..bcc79800aaf560b3f6945330d752f2663948e23f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * dispnew.c (scrolling_window): Don't exclude the case that the
+       last enabled row in the desired matrix touches the bottom boundary.
+
 2011-05-21  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in ($(etc)/DOC): Make second command line even shorter.