From 8d0efee90c0ad3b44c14b77403599cba1b168044 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Fri, 12 Jun 2015 02:17:23 +0300 Subject: [PATCH] * lisp/bindings.el (debug-ignored-errors): Add mark-inactive. * lisp/simple.el (kill-region): Replace 'error' with 'user-error'. (Bug#20785) --- lisp/bindings.el | 2 +- lisp/simple.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/bindings.el b/lisp/bindings.el index b658914c454..3672812e5a1 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -633,7 +633,7 @@ okay. See `mode-line-format'.") ;; file-supersession should all be user-errors! `(beginning-of-line beginning-of-buffer end-of-line end-of-buffer end-of-file buffer-read-only - file-supersession + file-supersession mark-inactive user-error ;; That's the main one! )) diff --git a/lisp/simple.el b/lisp/simple.el index 1eb0643ef6f..46023a575f0 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4017,7 +4017,7 @@ some text between BEG and END, but we're killing the region." ;; calling `kill-append'. (interactive (list (mark) (point) 'region)) (unless (and beg end) - (error "The mark is not set now, so there is no region")) + (user-error "The mark is not set now, so there is no region")) (condition-case nil (let ((string (if region (funcall region-extract-function 'delete) -- 2.39.5