aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2014-08-10 02:55:39 +0300
committerJuri Linkov2014-08-10 02:55:39 +0300
commitaa4008091c9adcc23924983f45eb442f55217056 (patch)
tree6399538080d0db6411c7707e18fc65441dedfd90
parentea2eccbb490f968d87fac056dcadc8536ea5067b (diff)
downloademacs-aa4008091c9adcc23924983f45eb442f55217056.tar.gz
emacs-aa4008091c9adcc23924983f45eb442f55217056.zip
* lisp/vc/vc-annotate.el (vc-annotate-background-mode): Add :set
to reevaluate `vc-annotate-color-map'. Fixes: debbugs:18189
-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 @@
12014-08-09 Juri Linkov <juri@jurta.org>
2
3 * vc/vc-annotate.el (vc-annotate-background-mode): Add :set
4 to reevaluate `vc-annotate-color-map'. (Bug#18189)
5
12014-08-09 Alan Mackenzie <acm@muc.de> 62014-08-09 Alan Mackenzie <acm@muc.de>
2 7
3 * progmodes/cc-fonts.el (c-font-lock-declarators): Remove check 8 * 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
54to the foreground, and the color from the option `vc-annotate-background' 54to the foreground, and the color from the option `vc-annotate-background'
55is applied to the background." 55is applied to the background."
56 :type 'boolean 56 :type 'boolean
57 :set (lambda (symbol value)
58 (set-default symbol value)
59 (when (boundp 'vc-annotate-color-map)
60 (ignore-errors
61 ;; Update the value of the dependent variable.
62 (custom-reevaluate-setting 'vc-annotate-color-map))))
57 :version "24.5" 63 :version "24.5"
58 :group 'vc) 64 :group 'vc)
59 65