/[emacs]/emacs/src/charset.c
ViewVC logotype

Diff of /emacs/src/charset.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.130 by lektu, Thu Jun 27 16:13:17 2002 UTC revision 1.131 by raeburn, Mon Jul 15 00:00:35 2002 UTC
# Line 700  DESCRIPTION (string) is the description Line 700  DESCRIPTION (string) is the description
700        || !STRINGP (vec[7])        || !STRINGP (vec[7])
701        || !STRINGP (vec[8]))        || !STRINGP (vec[8]))
702      error ("Invalid info-vector argument for defining charset %s",      error ("Invalid info-vector argument for defining charset %s",
703             XSTRING (SYMBOL_NAME (charset_symbol))->data);             SDATA (SYMBOL_NAME (charset_symbol)));
704    
705    if (NILP (charset_id))    if (NILP (charset_id))
706      {      {
707        charset_id = get_new_private_charset_id (XINT (vec[0]), XINT (vec[2]));        charset_id = get_new_private_charset_id (XINT (vec[0]), XINT (vec[2]));
708        if (XINT (charset_id) == 0)        if (XINT (charset_id) == 0)
709          error ("There's no room for a new private charset %s",          error ("There's no room for a new private charset %s",
710                 XSTRING (SYMBOL_NAME (charset_symbol))->data);                 SDATA (SYMBOL_NAME (charset_symbol)));
711      }      }
712    
713    update_charset_table (charset_id, vec[0], vec[1], vec[2], vec[3],    update_charset_table (charset_id, vec[0], vec[1], vec[2], vec[3],
# Line 779  CHARSET should be defined by `defined-ch Line 779  CHARSET should be defined by `defined-ch
779    if (XINT (final_char) < '0' || XFASTINT (final_char) > '~')    if (XINT (final_char) < '0' || XFASTINT (final_char) > '~')
780      error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars));      error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars));
781    if ((charset = get_charset_id (charset_symbol)) < 0)    if ((charset = get_charset_id (charset_symbol)) < 0)
782      error ("Invalid charset %s", XSTRING (SYMBOL_NAME (charset_symbol))->data);      error ("Invalid charset %s", SDATA (SYMBOL_NAME (charset_symbol)));
783    
784    ISO_CHARSET_TABLE (dimension, chars, final_char) = charset;    ISO_CHARSET_TABLE (dimension, chars, final_char) = charset;
785    return Qnil;    return Qnil;
# Line 943  only `ascii', `eight-bit-control', and ` Line 943  only `ascii', `eight-bit-control', and `
943    CHECK_STRING (str);    CHECK_STRING (str);
944    
945    bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));    bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
946    find_charset_in_text (XSTRING (str)->data, XSTRING (str)->size,    find_charset_in_text (SDATA (str), SCHARS (str),
947                          STRING_BYTES (XSTRING (str)), charsets, table);                          SBYTES (str), charsets, table);
948    
949    val = Qnil;    val = Qnil;
950    if (charsets[1])    if (charsets[1])
# Line 1335  lisp_string_width (string, precision, nc Line 1335  lisp_string_width (string, precision, nc
1335       Lisp_Object string;       Lisp_Object string;
1336       int precision, *nchars, *nbytes;       int precision, *nchars, *nbytes;
1337  {  {
1338    int len = XSTRING (string)->size;    int len = SCHARS (string);
1339    int len_byte = STRING_BYTES (XSTRING (string));    int len_byte = SBYTES (string);
1340    unsigned char *str = XSTRING (string)->data;    unsigned char *str = SDATA (string);
1341    int i = 0, i_byte = 0;    int i = 0, i_byte = 0;
1342    int width = 0;    int width = 0;
1343    struct Lisp_Char_Table *dp = buffer_display_table ();    struct Lisp_Char_Table *dp = buffer_display_table ();

Legend:
Removed from v.1.130  
changed lines
  Added in v.1.131

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26