summaryrefslogtreecommitdiff
path: root/src/editfns.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1993-07-08 21:36:04 +0000
committerRoland McGrath <roland@gnu.org>1993-07-08 21:36:04 +0000
commitc9dd14e184296c66c39ff1bbe76885b17a1de393 (patch)
tree9a6d4aa295d188715fc424d6bc0a43da7fae1af1 /src/editfns.c
parent638b77e614b0cde9a734ea6479a29adb831595af (diff)
downloademacs-c9dd14e184296c66c39ff1bbe76885b17a1de393.tar.gz
emacs-c9dd14e184296c66c39ff1bbe76885b17a1de393.tar.bz2
emacs-c9dd14e184296c66c39ff1bbe76885b17a1de393.zip
(region_limit): Don't error if Vmark_even_if_inactive is set. When the
mark is inactive and that is a no-no, signal mark-inactive instead of using error with a message.
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 78f1b1a710a..394a9ea91a7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -198,8 +198,9 @@ region_limit (beginningp)
int beginningp;
{
register Lisp_Object m;
- if (!NILP (Vtransient_mark_mode) && NILP (current_buffer->mark_active))
- error ("There is no region now");
+ if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
+ && NILP (current_buffer->mark_active))
+ Fsignal (Qmark_inactive, Qnil);
m = Fmarker_position (current_buffer->mark);
if (NILP (m)) error ("There is no region now");
if ((point < XFASTINT (m)) == beginningp)