Mercurial > emacs
comparison src/callint.c @ 4039:77cb08d1c4a5
(check_mark): Don't check mark-active unless in transient-mark-mode.
For inactive mark, signal mark-inactive instead of error with a message.
| author | Roland McGrath <roland@gnu.org> |
|---|---|
| date | Thu, 08 Jul 1993 21:43:11 +0000 |
| parents | 718280a1ba74 |
| children | 79184227e7f9 |
comparison
equal
deleted
inserted
replaced
| 4038:03a4c3912c13 | 4039:77cb08d1c4a5 |
|---|---|
| 143 check_mark () | 143 check_mark () |
| 144 { | 144 { |
| 145 Lisp_Object tem = Fmarker_buffer (current_buffer->mark); | 145 Lisp_Object tem = Fmarker_buffer (current_buffer->mark); |
| 146 if (NILP (tem) || (XBUFFER (tem) != current_buffer)) | 146 if (NILP (tem) || (XBUFFER (tem) != current_buffer)) |
| 147 error ("The mark is not set now"); | 147 error ("The mark is not set now"); |
| 148 if (NILP (current_buffer->mark_active) && NILP (Vmark_even_if_inactive)) | 148 if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive) |
| 149 error ("The mark is not active now"); | 149 && NILP (current_buffer->mark_active)) |
| 150 Fsignal (Qmark_inactive, Qnil); | |
| 150 } | 151 } |
| 151 | 152 |
| 152 | 153 |
| 153 DEFUN ("call-interactively", Fcall_interactively, Scall_interactively, 1, 2, 0, | 154 DEFUN ("call-interactively", Fcall_interactively, Scall_interactively, 1, 2, 0, |
| 154 "Call FUNCTION, reading args according to its interactive calling specs.\n\ | 155 "Call FUNCTION, reading args according to its interactive calling specs.\n\ |