aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoland McGrath1993-07-08 21:36:04 +0000
committerRoland McGrath1993-07-08 21:36:04 +0000
commitc9dd14e184296c66c39ff1bbe76885b17a1de393 (patch)
tree9a6d4aa295d188715fc424d6bc0a43da7fae1af1 /src
parent638b77e614b0cde9a734ea6479a29adb831595af (diff)
downloademacs-c9dd14e184296c66c39ff1bbe76885b17a1de393.tar.gz
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')
-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)
198 int beginningp; 198 int beginningp;
199{ 199{
200 register Lisp_Object m; 200 register Lisp_Object m;
201 if (!NILP (Vtransient_mark_mode) && NILP (current_buffer->mark_active)) 201 if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
202 error ("There is no region now"); 202 && NILP (current_buffer->mark_active))
203 Fsignal (Qmark_inactive, Qnil);
203 m = Fmarker_position (current_buffer->mark); 204 m = Fmarker_position (current_buffer->mark);
204 if (NILP (m)) error ("There is no region now"); 205 if (NILP (m)) error ("There is no region now");
205 if ((point < XFASTINT (m)) == beginningp) 206 if ((point < XFASTINT (m)) == beginningp)