aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/ediff-diff.el
diff options
context:
space:
mode:
authorGlenn Morris2017-04-17 20:16:15 -0400
committerGlenn Morris2017-04-17 20:16:15 -0400
commit2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d (patch)
tree4b8da28a02b175857c275a1d499f427242042fa5 /lisp/vc/ediff-diff.el
parent2e3a33659fb85330ec76a67b2113472e7e0b546a (diff)
downloademacs-2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d.tar.gz
emacs-2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d.zip
ediff: use user-error rather than debug-ignored-errors
* lisp/vc/ediff-diff.el (ediff-prepare-error-list): * lisp/vc/ediff-help.el (ediff-help-for-quick-help): * lisp/vc/ediff-init.el (ediff-barf-if-not-control-buffer) (ediff-check-version): * lisp/vc/ediff-merg.el (ediff-shrink-window-C): * lisp/vc/ediff-mult.el (ediff-draw-dir-diffs, ediff-show-dir-diffs) (ediff-append-custom-diff, ediff-meta-show-patch) (ediff-filegroup-action, ediff-show-meta-buffer, ediff-show-registry) (ediff-get-meta-info, ediff-patch-file-form-meta): * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): * lisp/vc/ediff-util.el (ediff-toggle-autorefine) (ediff--check-ancestor-exists, ediff-toggle-read-only) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-toggle-show-clashes-only) (ediff-next-difference, ediff-previous-difference) (ediff-pop-diff, ediff-read-file-name, ediff-verify-file-buffer) (ediff-save-buffer): * lisp/vc/ediff-wind.el (ediff-make-wide-display): * lisp/vc/ediff.el (ediff-find-file, ediff-buffers-internal) (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-regions-wordwise, ediff-regions-linewise) (ediff-load-version-control): Use user-error. (debug-ignored-errors): No longer modify.
Diffstat (limited to 'lisp/vc/ediff-diff.el')
-rw-r--r--lisp/vc/ediff-diff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index ded82c41c9b..b957bdce4f7 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -340,7 +340,7 @@ one optional arguments, diff-number to refine.")
340 (ediff-skip-unsuitable-frames) 340 (ediff-skip-unsuitable-frames)
341 (switch-to-buffer error-buf) 341 (switch-to-buffer error-buf)
342 (ediff-kill-buffer-carefully ctl-buf) 342 (ediff-kill-buffer-carefully ctl-buf)
343 (error "Errors in diff output. Diff output is in %S" diff-buff)))) 343 (user-error "Errors in diff output. Diff output is in %S" diff-buff))))
344 344
345;; BOUNDS specifies visibility bounds to use. 345;; BOUNDS specifies visibility bounds to use.
346;; WORD-MODE tells whether we are in the word-mode or not. 346;; WORD-MODE tells whether we are in the word-mode or not.