Require diff-mode at run-time as well.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edf17db7b1768bc1451d63ad005aa84a396cc719..41261a250e8cad43f3b7ec5af36f194e9acf2de3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
+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)