From: Juri Linkov <juri@linkov.net>
Date: Thu, 11 Jun 2015 23:17:23 +0000 (+0300)
Subject: * lisp/bindings.el (debug-ignored-errors): Add mark-inactive.
X-Git-Tag: emacs-25.0.90~1796
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d0efee90c0ad3b44c14b77403599cba1b168044;p=emacs.git

* lisp/bindings.el (debug-ignored-errors): Add mark-inactive.

* lisp/simple.el (kill-region): Replace 'error' with 'user-error'.
(Bug#20785)
---

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)