Require diff-mode at run-time as well.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e25b20166981ed89ee49aa67a915d426c97db8a1..41261a250e8cad43f3b7ec5af36f194e9acf2de3 100644 (file)
--- 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