# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1158432285 0
# Node ID 9c3b1f40669d69d7555d569134129f05046d7dd2
# Parent  c2b72b555fc46301ce71e71fda9859f4d8acb9cc
*** empty log message ***

diff -r c2b72b555fc4 -r 9c3b1f40669d lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 16 18:43:57 2006 +0000
+++ b/lisp/ChangeLog	Sat Sep 16 18:44:45 2006 +0000
@@ -1,3 +1,16 @@
+2006-09-16  Richard Stallman  <rms@gnu.org>
+
+	* textmodes/conf-mode.el (conf-mode-map): Use conf-space-keywords cmd.
+	(conf-space-mode): Don't handle prefix arg.
+	Delete conf-space-keywords-override code.
+	Use add-hook.
+	(conf-space-keywords): New command.
+	(conf-space-mode-internal): Be careful with imenu-generic-expression.
+	Delete conf-space-keywords-override code.
+	(conf-space-keywords-alist): Doc fix.
+	(conf-space-font-lock-keywords): Doc fix.
+	(conf-space-keywords-override): Var deleted.
+
 2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
 
 	* startup.el (fancy-splash-screens): Don't switch to the scratch
diff -r c2b72b555fc4 -r 9c3b1f40669d src/ChangeLog
--- a/src/ChangeLog	Sat Sep 16 18:43:57 2006 +0000
+++ b/src/ChangeLog	Sat Sep 16 18:44:45 2006 +0000
@@ -18806,6 +18806,14 @@
 
 	* Makefile.in (fns.o): Depend on coding.h.
 
+2003-01-06  Dave Love  <fx@gnu.org>
+
+	* fns.c: Include coding.h.  Use POINTER_TYPE*, not void*.
+	(Vlocale_coding_system): Declare.
+	(Qcodeset, Qdays, Qmonths, Qpaper): New.
+	(Flanginfo): New.
+	(syms_of_fns): Initialize new stuff.
+
 2003-01-07  Markus Rost  <rost@math.ohio-state.edu>
 
 	* minibuf.c (Fread_variable): Doc fix.