From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Fri, 29 Jun 2012 02:19:32 +0000 (+0400)
Subject: * editfns.c (region_limit): Fix type mismatch.
X-Git-Tag: emacs-24.2.90~1199^2~291
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e984ee810066a79ef57bbb82c925bcdd70bd334;p=emacs.git

* editfns.c (region_limit): Fix type mismatch.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b7a1da9cd57..09fc8fbfda2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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
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);
     }
 }