diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-14 02:51:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-14 02:51:30 -0800 |
| commit | 59815c02506eb39b61e672528ed03885749ba529 (patch) | |
| tree | 08770ed78fae3dc1a0996250d61e127ebfd135fd /src/coding.c | |
| parent | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (diff) | |
| parent | 898169a2d88c3538cdfd41feb0b16267165065bd (diff) | |
| download | emacs-59815c02506eb39b61e672528ed03885749ba529.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/coding.c b/src/coding.c index 74cf232cfb2..a2ea9b302cf 100644 --- a/src/coding.c +++ b/src/coding.c @@ -8755,6 +8755,7 @@ to the string. */) } positions = Qnil; + charset_map_loaded = 0; while (1) { int c; @@ -8782,6 +8783,16 @@ to the string. */) } from++; + if (charset_map_loaded && NILP (string)) + { + p = CHAR_POS_ADDR (from); + pend = CHAR_POS_ADDR (to); + if (from < GPT && to >= GPT) + stop = GPT_ADDR; + else + stop = pend; + charset_map_loaded = 0; + } } return (NILP (count) ? Fcar (positions) : Fnreverse (positions)); |