*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83129833d2b9d664c5ad826db73fc45658a7d3e3..5f94fa6f83adf98760b52bea11df7fa16bf0c688 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-09  Richard Stallman  <rms@gnu.org>
+
+       * textmodes/conf-mode.el (conf-space-mode): Use
+       hack-local-variables-hook instead of calling hack-local-variables.
+       (conf-space-keywords-override): New variable.
+
 2006-09-09  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
 
        * progmodes/python.el (python-font-lock-keywords): Add `self' and other

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index c13f67b69a3a9b8c2607efec4f55f5cdd0901a1d..4838617091201c579f5c6cfde75abbfc01b6a690 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-09  Richard Stallman  <rms@gnu.org>
 
+       * windows.texi (Window Hooks): Explain limits of
+       window-scroll-functions.
+
        * display.texi (Fringe Indicators): Update for last change in
        indicate-buffer-boundaries.