Commit 6c1bd3f3 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #6540 with a crash while inserting non-ASCII text under cache-long-line-scans.

 src/search.c (scan_buffer): Pass character positions to
 know_region_cache, not byte positions.  (Bug#6540)
parent edd9679c
2012-01-07 Eli Zaretskii <eliz@gnu.org>
* search.c (scan_buffer): Pass character positions to
know_region_cache, not byte positions. (Bug#6540)
2012-01-07 LynX <_LynX@bk.ru> (tiny change)
* w32.c (sys_rename): Report EXDEV when rename of a directory
......
......@@ -725,8 +725,8 @@ scan_buffer (register int target, EMACS_INT start, EMACS_INT end,
the region from start to cursor is free of them. */
if (target == '\n' && newline_cache)
know_region_cache (current_buffer, newline_cache,
start_byte + scan_start - base,
start_byte + cursor - base);
BYTE_TO_CHAR (start_byte + scan_start - base),
BYTE_TO_CHAR (start_byte + cursor - base));
/* Did we find the target character? */
if (cursor < ceiling_addr)
......@@ -791,8 +791,8 @@ scan_buffer (register int target, EMACS_INT start, EMACS_INT end,
the region from after the cursor to start is free of them. */
if (target == '\n' && newline_cache)
know_region_cache (current_buffer, newline_cache,
start_byte + cursor - base,
start_byte + scan_start - base);
BYTE_TO_CHAR (start_byte + cursor - base),
BYTE_TO_CHAR (start_byte + scan_start - base));
/* Did we find the target character? */
if (cursor >= ceiling_addr)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment