From 2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 17 Apr 2017 20:16:15 -0400 Subject: 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. --- lisp/vc/ediff-help.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/vc/ediff-help.el') diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index 52a48252075..339d3a513b6 100644 --- a/lisp/vc/ediff-help.el +++ b/lisp/vc/ediff-help.el @@ -190,7 +190,7 @@ the value of this variable and the variables `ediff-help-message-*' in (overlays-at pos))))) (if (not (stringp cmd)) - (error "Hmm... I don't see an Ediff command around here...")) + (user-error "Hmm... I don't see an Ediff command around here...")) (ediff-documentation "Quick Help Commands") @@ -236,7 +236,7 @@ the value of this variable and the variables `ediff-help-message-*' in ((string= cmd "s") (re-search-forward "^['`‘]s['’]")) ((string= cmd "+") (re-search-forward "^['`‘]\\+['’]")) ((string= cmd "=") (re-search-forward "^['`‘]=['’]")) - (t (error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer"))) + (t (user-error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer"))) ) ; let case-fold-search )) -- cgit v1.2.1