diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/search.c | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.bz2 emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/search.c b/src/search.c index 160d08e3c8c..0d451bd11c3 100644 --- a/src/search.c +++ b/src/search.c @@ -1,5 +1,5 @@ /* String search routines for GNU Emacs. - Copyright (C) 1985-1987, 1993-1994, 1997-1999, 2001-2011 + Copyright (C) 1985-1987, 1993-1994, 1997-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -725,8 +725,8 @@ scan_buffer (register int target, ptrdiff_t start, ptrdiff_t 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, ptrdiff_t start, ptrdiff_t 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) @@ -1303,7 +1303,7 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte, checking if we can use boyer-moore search. If TRT is non-nil, we can use boyer-moore search only if TRT can be represented by the byte array of 256 elements. For that, - all non-ASCII case-equivalents of all case-senstive + all non-ASCII case-equivalents of all case-sensitive characters in STRING must belong to the same charset and row. */ |