diff options
Diffstat (limited to 'lisp/vc/ediff-wind.el')
-rw-r--r-- | lisp/vc/ediff-wind.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 9b3d53fca76..31dcf3b69f9 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1184,7 +1184,7 @@ The frame to be resized is kept in `ediff-wide-display-frame'. This function modifies only the left margin and the width of the display. It assumes that it is called from within the control buffer." (if (not (fboundp 'ediff-display-pixel-width)) - (error "Can't determine display width")) + (user-error "Can't determine display width")) (let* ((frame-A (window-frame ediff-window-A)) (frame-A-params (frame-parameters frame-A)) (cw (ediff-frame-char-width frame-A)) |