2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 84a98497709..17d16b23b19 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-17  Ken Raeburn  <raeburn@gnu.org>
+
+        * coding.c (setup_coding_system): Don't do any designation based
+        on reg_bits if charset is not yet defined.
+
 2001-07-17  Gerd Moellmann  <gerd@gnu.org>
 
         * keyboard.c (KBD_BUFFER_SIZE) [!HAVE_WINDOW_SYSTEM]: Increase
diff --git a/src/coding.c b/src/coding.c
index 34773217cc7..8556591e92b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3638,7 +3638,7 @@ setup_coding_system (coding_system, coding)
         if (reg_bits)
           for (charset = 0; charset <= MAX_CHARSET; charset++)
             {
-              if (CHARSET_VALID_P (charset)
+              if (CHARSET_DEFINED_P (charset)
                   && (CODING_SPEC_ISO_REQUESTED_DESIGNATION (coding, charset)
                       == CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION))
                 {