From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 18 Sep 2006 18:05:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~474
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b1119a0fd2c772e1f6b1e549fc1ee78aafb6ed4;p=emacs.git

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

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index ff06a55cbf0..e04fe1902a4 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -52,6 +52,8 @@ Windows only bug.
 
 ** allout.el patch to be installed.
 
+** run-with-idle-timer change causes problem for Semantic.
+
 ** iampure@gmail.com's Sep 15 bug report about View Changes In File.
 
 ** Peter_Dyballa@Web.DE's Sep 17 bug report about i-search and non-ASCII chars
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22765fcd309..d244569148f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-18  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+
+	* textmodes/conf-mode.el (conf-space-mode): Doc fix.
+        Delete duplicate make-local-variable form.
+        (conf-space-keywords): Add autoload cookie.
+        Fix typo (`keywords', not `keyword').
+
 2006-09-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* cus-start.el (all): Rename x-gtk-show-chooser-help-text to