# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1135537279 0
# Node ID 0bebcb6fda307ccccf243e8cfac1d9c8b3bc2fa6
# Parent  df2cba483a7b9e6a4b88c35da0469b12ce74dec0
*** empty log message ***

diff -r df2cba483a7b -r 0bebcb6fda30 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 25 19:01:08 2005 +0000
+++ b/lisp/ChangeLog	Sun Dec 25 19:01:19 2005 +0000
@@ -1,5 +1,9 @@
 2005-12-25  Richard M. Stallman  <rms@gnu.org>
 
+	* progmodes/delphi.el (delphi-other-face): Allow nil in type.
+
+	* locate.el (locate-header-face): Allow nil in type.
+
 	* progmodes/cpp.el (cpp-face-none-list): Use cpp-face instead of face.
 
 2005-12-25  Romain Francoise  <romain@orebokech.com>