From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 25 Dec 2005 19:01:19 +0000 (+0000)
Subject: (delphi-other-face): Allow nil in type.
X-Git-Tag: emacs-pretest-22.0.90~5076
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f9de17a614b75090861c9f5e70e9f0d08a7f0da;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb97e1decd2..c1cb1296b21 100644
--- 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 85f7e1339f3..cdc557c7274 100644
--- 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