diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1cdd6c07b47..97c3ca9547d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-07-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * editfns.c (region_limit): Simplify by using clip_to_bounds. | ||
| 4 | |||
| 1 | 2012-07-05 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2012-07-05 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * gtkutil.c (gtk_scrollbar_new, gtk_box_new): Define when HAVE_GTK3 is | 7 | * gtkutil.c (gtk_scrollbar_new, gtk_box_new): Define when HAVE_GTK3 is |
diff --git a/src/editfns.c b/src/editfns.c index 741a97f7113..5ca68d4f37a 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -281,13 +281,10 @@ region_limit (int beginningp) | |||
| 281 | if (NILP (m)) | 281 | if (NILP (m)) |
| 282 | error ("The mark is not set now, so there is no region"); | 282 | error ("The mark is not set now, so there is no region"); |
| 283 | 283 | ||
| 284 | if ((PT < XFASTINT (m)) == (beginningp != 0)) | 284 | /* Clip to the current narrowing (bug#11770). */ |
| 285 | return make_number (PT); | 285 | return make_number ((PT < XFASTINT (m)) == (beginningp != 0) |
| 286 | else | 286 | ? PT |
| 287 | { /* Clip to the current narrowing (bug#11770). */ | 287 | : clip_to_bounds (BEGV, XFASTINT (m), ZV)); |
| 288 | ptrdiff_t mark = XFASTINT (m); | ||
| 289 | return make_number (mark < BEGV ? BEGV : mark > ZV ? ZV : mark); | ||
| 290 | } | ||
| 291 | } | 288 | } |
| 292 | 289 | ||
| 293 | DEFUN ("region-beginning", Fregion_beginning, Sregion_beginning, 0, 0, 0, | 290 | DEFUN ("region-beginning", Fregion_beginning, Sregion_beginning, 0, 0, 0, |