From: Roland McGrath <roland@gnu.org>
Date: Thu, 8 Jul 1993 21:43:11 +0000 (+0000)
Subject: (check_mark): Don't check mark-active unless in transient-mark-mode.
X-Git-Tag: emacs-19.34~11812
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6497d2d8381b7a89f8063729936f94c434051995;p=emacs.git

(check_mark): Don't check mark-active unless in transient-mark-mode.
For inactive mark, signal mark-inactive instead of error with a message.
---

diff --git a/src/callint.c b/src/callint.c
index 1ffd839bcb3..f7590e4164a 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -145,8 +145,9 @@ check_mark ()
   Lisp_Object tem = Fmarker_buffer (current_buffer->mark);
   if (NILP (tem) || (XBUFFER (tem) != current_buffer))
     error ("The mark is not set now");
-  if (NILP (current_buffer->mark_active) && NILP (Vmark_even_if_inactive))
-    error ("The mark is not active now");
+  if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
+      && NILP (current_buffer->mark_active))
+    Fsignal (Qmark_inactive, Qnil);
 }