diff options
| author | Roland McGrath <roland@gnu.org> | 1993-07-08 21:43:11 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1993-07-08 21:43:11 +0000 |
| commit | 6497d2d8381b7a89f8063729936f94c434051995 (patch) | |
| tree | f78dcac2fb746ec997bb667092c86cc1a84ae83c /src/callint.c | |
| parent | c9dd14e184296c66c39ff1bbe76885b17a1de393 (diff) | |
| download | emacs-6497d2d8381b7a89f8063729936f94c434051995.tar.gz | |
(check_mark): Don't check mark-active unless in transient-mark-mode.
For inactive mark, signal mark-inactive instead of error with a message.
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); } |