aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-03-19 01:44:34 +0000
committerStefan Monnier2008-03-19 01:44:34 +0000
commit14b7a0b52728e51ac20d4f4467f6329bc7c58f4b (patch)
tree0fd32822312748d44bf3df68702bd51744f1eb35
parent3253c7c65fa5da042b0df2573710e7a2d147e501 (diff)
downloademacs-14b7a0b52728e51ac20d4f4467f6329bc7c58f4b.tar.gz
emacs-14b7a0b52728e51ac20d4f4467f6329bc7c58f4b.zip
(vc-annotate-background): Fix custom type.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37938c1bc44..1097aea3d72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-03-19 Gustav H$(Q)[(Bllberg <gustav@virtutech.com> (tiny change)
2
3 * vc.el (vc-annotate-background): Fix custom type.
4
12008-03-19 Stefan Monnier <monnier@iro.umontreal.ca> 52008-03-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * descr-text.el (describe-char-unidata-list): Allow specifying 7 * 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)."
851(defcustom vc-annotate-background "black" 851(defcustom vc-annotate-background "black"
852 "Background color for \\[vc-annotate]. 852 "Background color for \\[vc-annotate].
853Default color is used if nil." 853Default color is used if nil."
854 :type 'string 854 :type '(choice (const :tag "Default background" nil) (color))
855 :group 'vc) 855 :group 'vc)
856 856
857(defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01) 857(defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01)