# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1157844117 0
# Node ID d46f55287c80e85fcc38fd2805f8801bf38e3e47
# Parent  88fd4983fe7849d3773ab8117f52dc800e2ba134
*** empty log message ***

diff -r 88fd4983fe78 -r d46f55287c80 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 09 23:20:39 2006 +0000
+++ b/lisp/ChangeLog	Sat Sep 09 23:21:57 2006 +0000
@@ -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 -r 88fd4983fe78 -r d46f55287c80 lispref/ChangeLog
--- a/lispref/ChangeLog	Sat Sep 09 23:20:39 2006 +0000
+++ b/lispref/ChangeLog	Sat Sep 09 23:21:57 2006 +0000
@@ -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.