Re: Building emacs with and without X -- packaging question.

[Alan Shutko <ats@acm.org>]

Stefan Monnier <monnier+gnu/emacs@rum.cs.yale.edu> writes:

> Please show us the diff, since any difference is a bug.

Ok.  Turns out it's very small.

*** etc/DOC-21.2.90.1	Mon Jun 10 16:11:09 2002
--- etc/DOC-21.2.90.2	Mon Jun 10 16:15:01 2002
***************
*** 2507,2607 ****
  Note that if value is nil, a scalable font might still be used, if no
  other font of the appropriate family and registry is available.\x1fVface-ignored-fonts
  List of ignored fonts.
! Each element is a regular expression that matches names of fonts to ignore.\x1fFquery-fontset
! Return the name of a fontset that matches PATTERN.
! The value is nil if there is no matching fontset.
! PATTERN can contain `*' or `?' as a wildcard
! just as X font name matching algorithm allows.
! If REGEXPP is non-nil, PATTERN is a regular expression.
! 
! (query-fontset PATTERN &optional REGEXPP)\x1fFnew-fontset
! Create a new fontset NAME that contains font information in FONTLIST.
! FONTLIST is an alist of charsets vs corresponding font name patterns.
! 
! (new-fontset NAME FONTLIST)\x1fFset-fontset-font
! Modify fontset NAME to use FONTNAME for CHARACTER.
! 
! CHARACTER may be a cons; (FROM . TO), where FROM and TO are
! non-generic characters.  In that case, use FONTNAME
! for all characters in the range FROM and TO (inclusive).
! CHARACTER may be a charset.   In that case, use FONTNAME
! for all character in the charsets.
! 
! FONTNAME may be a cons; (FAMILY . REGISTRY), where FAMILY is a family
! name of a font, REGSITRY is a registry name of a font.
! 
! (set-fontset-font NAME CHARACTER FONTNAME &optional FRAME)\x1fFfont-info
! Return information about a font named NAME on frame FRAME.
! If FRAME is omitted or nil, use the selected frame.
! The returned value is a vector of OPENED-NAME, FULL-NAME, CHARSET, SIZE,
!   HEIGHT, BASELINE-OFFSET, RELATIVE-COMPOSE, and DEFAULT-ASCENT,
! where
!   OPENED-NAME is the name used for opening the font,
!   FULL-NAME is the full name of the font,
!   SIZE is the maximum bound width of the font,
!   HEIGHT is the height of the font,
!   BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
!   RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
!     how to compose characters.
! If the named font is not yet loaded, return nil.
! 
! (font-info NAME &optional FRAME)\x1fFinternal-char-font
! For internal use only.
! 
! (internal-char-font POSITION)\x1fFfontset-info
! Return information about a fontset named NAME on frame FRAME.
! The value is a vector:
!   [ SIZE HEIGHT ((CHARSET-OR-RANGE FONT-SPEC OPENED ...) ...) ],
! where,
!   SIZE is the maximum bound width of ASCII font in the fontset,
!   HEIGHT is the maximum bound height of ASCII font in the fontset,
!   CHARSET-OR-RANGE is a charset, a character (may be a generic character)
!     or a cons of two characters specifying the range of characters.
!   FONT-SPEC is a fontname pattern string or a cons (FAMILY . REGISTRY),
!     where FAMILY is a `FAMILY' field of a XLFD font name,
!     REGISTRY is a `CHARSET_REGISTRY' field of a XLDF font name.
!     FAMILY may contain a `FOUNDARY' field at the head.
!     REGISTRY may contain a `CHARSET_ENCODING' field at the tail.
!   OPENEDs are names of fonts actually opened.
! If the ASCII font is not yet opened, SIZE and HEIGHT are 0.
! If FRAME is omitted, it defaults to the currently selected frame.
! 
! (fontset-info NAME &optional FRAME)\x1fFfontset-font
! Return a font name pattern for character CH in fontset NAME.
! If NAME is t, find a font name pattern in the default fontset.
! 
! (fontset-font NAME CH)\x1fFfontset-list
! Return a list of all defined fontset names.
! 
! (fontset-list)\x1fVfont-encoding-alist
! Alist of fontname patterns vs corresponding encoding info.
! Each element looks like (REGEXP . ENCODING-INFO),
!  where ENCODING-INFO is an alist of CHARSET vs ENCODING.
! 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.\x1fVuse-default-ascent
! Char table of characters whose ascent values should be ignored.
! If an entry for a character is non-nil, the ascent value of the glyph
! is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font.
! 
! This affects how a composite character which contains
! such a character is displayed on screen.\x1fVignore-relative-composition
! Char table of characters which is not composed relatively.
! If an entry for a character is non-nil, a composition sequence
! which contains that character is displayed so that
! the glyph of that character is put without considering
! an ascent and descent value of a previous character.\x1fValternate-fontname-alist
! Alist of fontname vs list of the alternate fontnames.
! When a specified font name is not found, the corresponding
! alternate fontnames (if any) are tried instead.\x1fVfontset-alias-alist
! Alist of fontset names vs the aliases.\x1fVhighlight-wrong-size-font
! *This variable is obsolete.\x1fVclip-large-size-font
! *This variable is obsolete.\x1fVvertical-centering-font-regexp
! *Regexp matching font names that require vertical centering on display.
! When a character is displayed with such fonts, the character is displayed
! at the vertival center of lines.\x1fFinvocation-name
  Return the program name that was used to run Emacs.
  Any directory names are omitted.
  
--- 2507,2513 ----
  Note that if value is nil, a scalable font might still be used, if no
  other font of the appropriate family and registry is available.\x1fVface-ignored-fonts
  List of ignored fonts.
! Each element is a regular expression that matches names of fonts to ignore.\x1fFinvocation-name
  Return the program name that was used to run Emacs.
  Any directory names are omitted.
  


-- 
Alan Shutko <ats@acm.org> - In a variety of flavors!
Everybody wants to go to heaven, but nobody wants to die.