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

lisp/ChangeLog

 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>

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