* lisp/vc/vc-annotate.el (vc-annotate-background-mode): Use `with-demoted-errors'

instead of `ignore-errors'.

Fixes: debbugs:18189

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 428ea4fffde..f91f3a0351e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-12  Juri Linkov  <juri@jurta.org>
+
+        * vc/vc-annotate.el (vc-annotate-background-mode):
+        Use `with-demoted-errors' instead of `ignore-errors'.  (Bug#18189)
+
 2014-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (out-of-memory-warning-percentage): Turn it off by default.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index a9085bc901f..d0887fe3531 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -57,7 +57,7 @@ is applied to the background."
   :set (lambda (symbol value)
          (set-default symbol value)
          (when (boundp 'vc-annotate-color-map)
-           (ignore-errors
+           (with-demoted-errors
              ;; Update the value of the dependent variable.
              (custom-reevaluate-setting 'vc-annotate-color-map))))
   :version "24.5"