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

Diff of /emacs/src/fontset.c

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

revision 1.65.2.4 by fx, Fri May 17 16:29:46 2002 UTC revision 1.65.2.5 by fx, Sat May 25 12:43:42 2002 UTC
# Line 1109  where, Line 1109  where,
1109    CHARSET-OR-RANGE is a charset or a cons of two characters specifying    CHARSET-OR-RANGE is a charset or a cons of two characters specifying
1110      the range of characters.      the range of characters.
1111    FONT-SPEC is a fontname pattern string or a vector    FONT-SPEC is a fontname pattern string or a vector
1112      [ FAMILY WEIGHT SLANT ADSTYLE REGISTRY ].      [ FAMILY WEIGHT SLANT WIDTH ADSTYLE REGISTRY ].
1113      See the documentation of `new-fontset' for the meanings those elements.      See the documentation of `new-fontset' for the meanings those elements.
1114    OPENEDs are names of fonts actually opened.    OPENEDs are names of fonts actually opened.
1115  If the ASCII font is not yet opened, SIZE and HEIGHT are 0.  If the ASCII font is not yet opened, SIZE and HEIGHT are 0.
# Line 1172  If FRAME is omitted, it defaults to the Line 1172  If FRAME is omitted, it defaults to the
1172         CONSP (tail); tail = XCDR (tail))         CONSP (tail); tail = XCDR (tail))
1173      {      {
1174        elt = XCAR (tail);        elt = XCAR (tail);
1175        elt = Fcons (XCAR (elt), Fcons (XCDR (elt), Qnil));        elt = Fcons ((INTEGERP (XCAR (elt))
1176                        ? CHARSET_NAME (CHARSET_FROM_ID (XCAR (elt)))
1177                        : XCAR (elt)),
1178                       Fcons (XCDR (elt), Qnil));
1179        XSETCDR (XCAR (val), Fcons (elt, Qnil));        XSETCDR (XCAR (val), Fcons (elt, Qnil));
1180        XSETCAR (val, XCDR (XCAR (val)));        XSETCAR (val, XCDR (XCAR (val)));
1181      }      }
# Line 1291  syms_of_fontset () Line 1294  syms_of_fontset ()
1294    
1295    DEFVAR_LISP ("font-encoding-alist", &Vfont_encoding_alist,    DEFVAR_LISP ("font-encoding-alist", &Vfont_encoding_alist,
1296                 doc: /* Alist of fontname patterns vs corresponding encoding info.                 doc: /* Alist of fontname patterns vs corresponding encoding info.
1297  Each element looks like (REGEXP . ENCODING-INFO),  Each element looks like (REGEXP . CHARSET), where CHARSET is an
1298   where ENCODING-INFO is an alist of CHARSET vs ENCODING.  Emacs charset symbol.  */);
 ENCODING is one of the following integer values:  
         0: code points 0x20..0x7F or 0x2020..0x7F7F are used,  
         1: code points 0xA0..0xFF or 0xA0A0..0xFFFF are used,  
         2: code points 0x20A0..0x7FFF are used,  
         3: code points 0xA020..0xFF7F are used.  */);  
1299    Vfont_encoding_alist = Qnil;    Vfont_encoding_alist = Qnil;
1300    
1301    DEFVAR_LISP ("use-default-ascent", &Vuse_default_ascent,    DEFVAR_LISP ("use-default-ascent", &Vuse_default_ascent,

Legend:
Removed from v.1.65.2.4  
changed lines
  Added in v.1.65.2.5

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