- if ( CHARSETP (mother) )
- {
- if (XCHARSET_FINAL (charset) >= '0')
- code = charset_code_point (mother, ch, 1);
- else
- code = charset_code_point (mother, ch, defined_only);
- }
- else if (defined_only)
+ if ( CHARSETP (mother) && ( accepted_mode >= 0)
+ && ( XCHARSET_FINAL (charset) >= '0' )
+ )
+ code = charset_code_point (mother, ch, CHAR_DEFINED_ONLY);
+ else if ( CHARSETP (mother)
+ && ( XCHARSET_FINAL (charset) < '0' )
+ )
+ code = charset_code_point (mother, ch, accepted_mode);
+ else if ( accepted_mode == CHAR_DEFINED_ONLY )