[Emacs-diffs] trunk r117693: * lisp/vc/vc-annotate.el (vc-annotate-background-mode): Use `with-demoted-errors'

[Juri Linkov]

------------------------------------------------------------
revno: 117693
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18189
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-08-12 09:51:21 +0300
message:
  * lisp/vc/vc-annotate.el (vc-annotate-background-mode): Use 
`with-demoted-errors'
  instead of `ignore-errors'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-annotate.el         
vcannotate.el-20091113204419-o5vbwnq5f7feedwu-8692

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-12 02:35:24 +0000
+++ b/lisp/ChangeLog    2014-08-12 06:51:21 +0000
@@ -1,3 +1,8 @@
+2014-08-12  Juri Linkov  <address@hidden>
+
+       * vc/vc-annotate.el (vc-annotate-background-mode):
+       Use `with-demoted-errors' instead of `ignore-errors'.  (Bug#18189)
+
 2014-08-12  Stefan Monnier  <address@hidden>
 
        * files.el (out-of-memory-warning-percentage): Turn it off by default.

=== modified file 'lisp/vc/vc-annotate.el'
--- a/lisp/vc/vc-annotate.el    2014-08-09 23:55:39 +0000
+++ b/lisp/vc/vc-annotate.el    2014-08-12 06:51:21 +0000
@@ -57,7 +57,7 @@
   :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"