X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4ab2b63c9946148b93555f709dff844b37251384..a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2:/lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e25b201669..41261a250e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2008-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* smerge-mode.el: Require diff-mode at run-time as well.
+
+2008-10-28  Martin Rudalics  <rudalics@gmx.at>
+
+	* vc-cvs.el (vc-cvs-stay-local): Fix typo in choice.
+	* vc-hooks.el (vc-stay-local): Likewise.
+
+2008-10-28  Phil Sung  <psung@mit.edu>  (tiny change)
+
+	* follow.el (follow-scroll-down, follow-calc-win-end)
+	(follow-estimate-first-window-start): Reduce effective window
+	height when header line is present.  (Bug#925)
+
 2008-10-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* subr.el (locate-user-emacs-file): Simplify.  Don't create