auto upstream

2 files changed, 6 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4328fda1f40..c324425a401 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-19  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coding.c (Fdetect_coding_region): Do not check start and end with
+        CHECK_NUMBER_COERCE_MARKER since validate_region does that itself.
+        (code_convert_region): Likewise.
+
 2012-12-18  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (acl_get_file, acl_set_file): Run the file name through
diff --git a/src/coding.c b/src/coding.c
index 56202e4861d..e42461f52a0 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -8426,9 +8426,6 @@ highest priority.  */)
   ptrdiff_t from, to;
   ptrdiff_t from_byte, to_byte;
 
-  CHECK_NUMBER_COERCE_MARKER (start);
-  CHECK_NUMBER_COERCE_MARKER (end);
-
   validate_region (&start, &end);
   from = XINT (start), to = XINT (end);
   from_byte = CHAR_TO_BYTE (from);
@@ -8872,8 +8869,6 @@ code_convert_region (Lisp_Object start, Lisp_Object end,
   ptrdiff_t from, from_byte, to, to_byte;
   Lisp_Object src_object;
 
-  CHECK_NUMBER_COERCE_MARKER (start);
-  CHECK_NUMBER_COERCE_MARKER (end);
   if (NILP (coding_system))
     coding_system = Qno_conversion;
   else