From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 9 Sep 2006 23:21:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~656
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d7b95f595913a8b3d42841ca6304f9e49f046bb;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83129833d2b..5f94fa6f83a 100644
--- 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 c13f67b69a3..48386170912 100644
--- 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.