diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-17 20:16:15 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-17 20:16:15 -0400 |
| commit | 2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d (patch) | |
| tree | 4b8da28a02b175857c275a1d499f427242042fa5 /lisp/vc/ediff-init.el | |
| parent | 2e3a33659fb85330ec76a67b2113472e7e0b546a (diff) | |
| download | emacs-2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d.tar.gz emacs-2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d.tar.bz2 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-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index e0542688593..59d97c3cea5 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -385,8 +385,8 @@ It needs to be killed when we quit the session.") (defsubst ediff-barf-if-not-control-buffer (&optional meta-buf-p) (or (ediff-in-control-buffer-p meta-buf-p) - (error "%S: This command runs in Ediff Control Buffer only!" - this-command))) + (user-error "%S: This command runs in Ediff Control Buffer only!" + this-command))) (defgroup ediff-highlighting nil "Highlighting of difference regions in Ediff." @@ -758,7 +758,7 @@ TYPE-OF-EMACS is either `emacs' or `xemacs'." (funcall op emacs-minor-version minor) t))) (t - (error "%S: Invalid op in ediff-check-version" op))))) + (user-error "%S: Invalid op in ediff-check-version" op))))) (defun ediff-color-display-p () (condition-case nil |