diff options
| author | Dmitry Antipov | 2012-06-29 06:19:32 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-06-29 06:19:32 +0400 |
| commit | 3e984ee810066a79ef57bbb82c925bcdd70bd334 (patch) | |
| tree | caf893981a3d2d94978703a54758fb15d2b502fd /src | |
| parent | ef884f239fea782ea5888d567b3c13c0b87ed5ea (diff) | |
| download | emacs-3e984ee810066a79ef57bbb82c925bcdd70bd334.tar.gz emacs-3e984ee810066a79ef57bbb82c925bcdd70bd334.zip | |
* editfns.c (region_limit): Fix type mismatch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b7a1da9cd57..09fc8fbfda2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2012-06-29 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2012-06-29 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | * editfns.c (region_limit): Fix type mismatch. | ||
| 4 | |||
| 5 | 2012-06-29 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 6 | |||
| 3 | * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be | 7 | * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be |
| 4 | undefined. Convert from xassert to eassert. | 8 | undefined. Convert from xassert to eassert. |
| 5 | * nsmenu.m: Convert from xassert to eassert. | 9 | * nsmenu.m: Convert from xassert to eassert. |
diff --git a/src/editfns.c b/src/editfns.c index e8f55c9427b..4c3b80be14a 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -287,7 +287,7 @@ region_limit (int beginningp) | |||
| 287 | else | 287 | else |
| 288 | { /* Clip to the current narrowing (bug#11770). */ | 288 | { /* Clip to the current narrowing (bug#11770). */ |
| 289 | ptrdiff_t mark = XFASTINT (m); | 289 | ptrdiff_t mark = XFASTINT (m); |
| 290 | return make_number (mark < BEGV ? BEGV : mark > ZV ? ZV : m); | 290 | return make_number (mark < BEGV ? BEGV : mark > ZV ? ZV : mark); |
| 291 | } | 291 | } |
| 292 | } | 292 | } |
| 293 | 293 | ||