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 @@
 2012-06-29  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * editfns.c (region_limit): Fix type mismatch.
+
+2012-06-29  Dmitry Antipov  <dmantipov@yandex.ru>
+
         * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be
         undefined.  Convert from xassert to eassert.
         * 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)
   else
     { /* Clip to the current narrowing (bug#11770).  */
       ptrdiff_t mark = XFASTINT (m);
-      return make_number (mark < BEGV ? BEGV : mark > ZV ? ZV : m);
+      return make_number (mark < BEGV ? BEGV : mark > ZV ? ZV : mark);
     }
 }