(delphi-other-face): Allow nil in type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb97e1decd27c7bdc32186335e2257c71abe271b..c1cb1296b216ccce43c30f59c435854d00b06bc4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>

diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 85f7e1339f38edad4f848695884a159958063a67..cdc557c727481a57bc5838cc952c30927bd87c45 100644 (file)
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -177,7 +177,7 @@ differs from the default."
 
 (defcustom delphi-other-face nil
   "*Face used to color everything else."
-  :type 'face
+  :type '(choice face (const nil))
   :group 'delphi)
 
 (defconst delphi-directives