summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-annotate.el6
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f62d0ee3b66..b0a0e0c95a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-09 Juri Linkov <juri@jurta.org>
+
+ * vc/vc-annotate.el (vc-annotate-background-mode): Add :set
+ to reevaluate `vc-annotate-color-map'. (Bug#18189)
+
2014-08-09 Alan Mackenzie <acm@muc.de>
* progmodes/cc-fonts.el (c-font-lock-declarators): Remove check
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index d3e10a63f56..a9085bc901f 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -54,6 +54,12 @@ When nil, the color range from `vc-annotate-color-map' is applied
to the foreground, and the color from the option `vc-annotate-background'
is applied to the background."
:type 'boolean
+ :set (lambda (symbol value)
+ (set-default symbol value)
+ (when (boundp 'vc-annotate-color-map)
+ (ignore-errors
+ ;; Update the value of the dependent variable.
+ (custom-reevaluate-setting 'vc-annotate-color-map))))
:version "24.5"
:group 'vc)