From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 19 Mar 2008 01:44:34 +0000 (+0000)
Subject: (vc-annotate-background): Fix custom type.
X-Git-Tag: emacs-pretest-23.0.90~7059
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14b7a0b52728e51ac20d4f4467f6329bc7c58f4b;p=emacs.git

(vc-annotate-background): Fix custom type.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37938c1bc44..1097aea3d72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-19  Gustav H$(Q)[(Bllberg  <gustav@virtutech.com>  (tiny change)
+
+	* vc.el (vc-annotate-background): Fix custom type.
+
 2008-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* descr-text.el (describe-char-unidata-list): Allow specifying
diff --git a/lisp/vc.el b/lisp/vc.el
index 742e960fbc7..274376765c5 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -851,7 +851,7 @@ all other colors between (excluding black and white)."
 (defcustom vc-annotate-background "black"
   "Background color for \\[vc-annotate].
 Default color is used if nil."
-  :type 'string
+  :type '(choice (const :tag "Default background" nil) (color))
   :group 'vc)
 
 (defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01)