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));