Commit c8b9f1bc authored by Eli Zaretskii's avatar Eli Zaretskii

Fix bug #12196 with infloop when cache-long-line-scans is non-nil.

 src/search.c (scan_buffer): Use character positions in calls to
 region_cache_forward and region_cache_backward, not byte
 positions.
parent 51eed9b8
2012-09-17 Eli Zaretskii <eliz@gnu.org>
* search.c (scan_buffer): Use character positions in calls to
region_cache_forward and region_cache_backward, not byte
positions. (Bug#12196)
* w32term.c (w32_read_socket): Set pending_signals to 1, like
xterm.c does. Reported by Daniel Colascione <dancol@dancol.org>.
......
......@@ -674,7 +674,7 @@ scan_buffer (register int target, ptrdiff_t start, ptrdiff_t end,
obstacle --- the last character the dumb search loop should
examine. */
ptrdiff_t ceiling_byte = CHAR_TO_BYTE (end) - 1;
ptrdiff_t start_byte = CHAR_TO_BYTE (start);
ptrdiff_t start_byte;
ptrdiff_t tem;
/* If we're looking for a newline, consult the newline cache
......@@ -684,18 +684,22 @@ scan_buffer (register int target, ptrdiff_t start, ptrdiff_t end,
ptrdiff_t next_change;
immediate_quit = 0;
while (region_cache_forward
(current_buffer, newline_cache, start_byte, &next_change))
start_byte = next_change;
(current_buffer, newline_cache, start, &next_change))
start = next_change;
immediate_quit = allow_quit;
start_byte = CHAR_TO_BYTE (start);
/* START should never be after END. */
if (start_byte > ceiling_byte)
start_byte = ceiling_byte;
/* Now the text after start is an unknown region, and
next_change is the position of the next known region. */
ceiling_byte = min (next_change - 1, ceiling_byte);
ceiling_byte = min (CHAR_TO_BYTE (next_change) - 1, ceiling_byte);
}
else
start_byte = CHAR_TO_BYTE (start);
/* The dumb loop can only scan text stored in contiguous
bytes. BUFFER_CEILING_OF returns the last character
......@@ -747,7 +751,7 @@ scan_buffer (register int target, ptrdiff_t start, ptrdiff_t end,
{
/* The last character to check before the next obstacle. */
ptrdiff_t ceiling_byte = CHAR_TO_BYTE (end);
ptrdiff_t start_byte = CHAR_TO_BYTE (start);
ptrdiff_t start_byte;
ptrdiff_t tem;
/* Consult the newline cache, if appropriate. */
......@@ -756,18 +760,22 @@ scan_buffer (register int target, ptrdiff_t start, ptrdiff_t end,
ptrdiff_t next_change;
immediate_quit = 0;
while (region_cache_backward
(current_buffer, newline_cache, start_byte, &next_change))
start_byte = next_change;
(current_buffer, newline_cache, start, &next_change))
start = next_change;
immediate_quit = allow_quit;
start_byte = CHAR_TO_BYTE (start);
/* Start should never be at or before end. */
if (start_byte <= ceiling_byte)
start_byte = ceiling_byte + 1;
/* Now the text before start is an unknown region, and
next_change is the position of the next known region. */
ceiling_byte = max (next_change, ceiling_byte);
ceiling_byte = max (CHAR_TO_BYTE (next_change), ceiling_byte);
}
else
start_byte = CHAR_TO_BYTE (start);
/* Stop scanning before the gap. */
tem = BUFFER_FLOOR_OF (start_byte - 1);
......
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