diff options
| author | Dmitry Antipov | 2012-12-19 19:52:48 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-12-19 19:52:48 +0400 |
| commit | a2f07cd28277fbcef42541509e3710a9863cac3a (patch) | |
| tree | 2bc2164d1af01ff4defc9f8782287d52ecfc5d23 | |
| parent | 3f781c75aceec46314eace32bf073e13914f683b (diff) | |
| download | emacs-a2f07cd28277fbcef42541509e3710a9863cac3a.tar.gz emacs-a2f07cd28277fbcef42541509e3710a9863cac3a.zip | |
* 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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/coding.c | 5 |
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 @@ | |||
| 1 | 2012-12-19 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * coding.c (Fdetect_coding_region): Do not check start and end with | ||
| 4 | CHECK_NUMBER_COERCE_MARKER since validate_region does that itself. | ||
| 5 | (code_convert_region): Likewise. | ||
| 6 | |||
| 1 | 2012-12-18 Eli Zaretskii <eliz@gnu.org> | 7 | 2012-12-18 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * w32.c (acl_get_file, acl_set_file): Run the file name through | 9 | * 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. */) | |||
| 8426 | ptrdiff_t from, to; | 8426 | ptrdiff_t from, to; |
| 8427 | ptrdiff_t from_byte, to_byte; | 8427 | ptrdiff_t from_byte, to_byte; |
| 8428 | 8428 | ||
| 8429 | CHECK_NUMBER_COERCE_MARKER (start); | ||
| 8430 | CHECK_NUMBER_COERCE_MARKER (end); | ||
| 8431 | |||
| 8432 | validate_region (&start, &end); | 8429 | validate_region (&start, &end); |
| 8433 | from = XINT (start), to = XINT (end); | 8430 | from = XINT (start), to = XINT (end); |
| 8434 | from_byte = CHAR_TO_BYTE (from); | 8431 | from_byte = CHAR_TO_BYTE (from); |
| @@ -8872,8 +8869,6 @@ code_convert_region (Lisp_Object start, Lisp_Object end, | |||
| 8872 | ptrdiff_t from, from_byte, to, to_byte; | 8869 | ptrdiff_t from, from_byte, to, to_byte; |
| 8873 | Lisp_Object src_object; | 8870 | Lisp_Object src_object; |
| 8874 | 8871 | ||
| 8875 | CHECK_NUMBER_COERCE_MARKER (start); | ||
| 8876 | CHECK_NUMBER_COERCE_MARKER (end); | ||
| 8877 | if (NILP (coding_system)) | 8872 | if (NILP (coding_system)) |
| 8878 | coding_system = Qno_conversion; | 8873 | coding_system = Qno_conversion; |
| 8879 | else | 8874 | else |