[Emacs-diffs] /srv/bzr/emacs/trunk r108882: * editfns.c (region_limit): Simplify by using clip_to_bounds.

[Paul Eggert]

------------------------------------------------------------
revno: 108882
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-05 09:00:20 -0700
message:
  * editfns.c (region_limit): Simplify by using clip_to_bounds.
modified:
  src/ChangeLog
  src/editfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-05 15:44:53 +0000
+++ b/src/ChangeLog     2012-07-05 16:00:20 +0000
@@ -1,3 +1,7 @@
+2012-07-05  Paul Eggert  <address@hidden>
+
+       * editfns.c (region_limit): Simplify by using clip_to_bounds.
+
 2012-07-05  Jan Djärv  <address@hidden>
 
        * gtkutil.c (gtk_scrollbar_new, gtk_box_new): Define when HAVE_GTK3 is

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2012-07-05 06:32:41 +0000
+++ b/src/editfns.c     2012-07-05 16:00:20 +0000
@@ -281,13 +281,10 @@
   if (NILP (m))
     error ("The mark is not set now, so there is no region");
 
-  if ((PT < XFASTINT (m)) == (beginningp != 0))
-    return make_number (PT);
-  else
-    { /* Clip to the current narrowing (bug#11770).  */
-      ptrdiff_t mark = XFASTINT (m);
-      return make_number (mark < BEGV ? BEGV : mark > ZV ? ZV : mark);
-    }
+  /* Clip to the current narrowing (bug#11770).  */
+  return make_number ((PT < XFASTINT (m)) == (beginningp != 0)
+                     ? PT
+                     : clip_to_bounds (BEGV, XFASTINT (m), ZV));
 }
 
 DEFUN ("region-beginning", Fregion_beginning, Sregion_beginning, 0, 0, 0,