[Emacs-diffs] /srv/bzr/emacs/trunk r105144: Minor xref additions to Lisp manual.

[Chong Yidong]

------------------------------------------------------------
revno: 105144
fixes bug(s): http://debbugs.gnu.org/4178
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-12 18:09:28 -0400
message:
  Minor xref additions to Lisp manual.
  
  * doc/lispref/display.texi (Face Attributes, Font Selection): Add
  references to the Fonts node in the Emacs manual.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-07-12 17:33:18 +0000
+++ b/doc/lispref/ChangeLog     2011-07-12 22:09:28 +0000
@@ -1,5 +1,10 @@
 2011-07-12  Chong Yidong  <address@hidden>
 
+       * display.texi (Face Attributes, Font Selection): Add references
+       to the Fonts node in the Emacs manual (Bug#4178).
+
+2011-07-12  Chong Yidong  <address@hidden>
+
        * display.texi (Window Systems): `window-system' is
        terminal-local.
 

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2011-07-12 17:33:18 +0000
+++ b/doc/lispref/display.texi  2011-07-12 22:09:28 +0000
@@ -1800,9 +1800,9 @@
 @cindex faces
 
   A @dfn{face} is a collection of graphical attributes for displaying
-text: font family, foreground color, background color, optional
-underlining, and so on.  Faces control how buffer text is displayed,
-and how some parts of the frame, such as the mode-line, are displayed.
+text: font, foreground color, background color, optional underlining,
+and so on.  Faces control how buffer text is displayed, and how some
+parts of the frame, such as the mode-line, are displayed.
 @xref{Standard Faces,,, emacs, The GNU Emacs Manual}, for the list of
 faces Emacs normally comes with.
 
@@ -2001,16 +2001,17 @@
 
 @table @code
 @item :family
-Font family name or fontset name (a string).  If you specify a font
-family name, the wild-card characters @samp{*} and @samp{?} are
-allowed.  The function @code{font-family-list}, described below,
-returns a list of available family names.  @xref{Fontsets}, for
-information about fontsets.
+Font family or fontset (a string).  @xref{Fonts,,, emacs, The GNU
+Emacs Manual}.  If you specify a font family name, the wild-card
+characters @samp{*} and @samp{?} are allowed.  The function
address@hidden, described below, returns a list of available
+family names.  @xref{Fontsets}, for information about fontsets.
 
 @item :foundry
-The name of the @dfn{font foundry} in which the font family specified
-by the @code{:family} attribute is located (a string).  The wild-card
-characters @samp{*} and @samp{?} are allowed.
+The name of the @dfn{font foundry} for the font family specified by
+the @code{:family} attribute (a string).  The wild-card characters
address@hidden and @samp{?} are allowed.  @xref{Fonts,,, emacs, The GNU
+Emacs Manual}.
 
 @item :width
 Relative proportionate character width, also known as the character
@@ -2684,14 +2685,15 @@
   Before Emacs can draw a character on a particular display, it must
 select a @dfn{font} for that address@hidden this context, the
 term @dfn{font} has nothing to do with Font Lock (@pxref{Font Lock
-Mode}).}.  Normally, Emacs automatically chooses a font based on the
-faces assigned to that character---specifically, the face attributes
address@hidden:family}, @code{:weight}, @code{:slant}, and @code{:width}
-(@pxref{Face Attributes}).  The choice of font also depends on the
-character to be displayed; some fonts can only display a limited set
-of characters.  If no available font exactly fits the requirements,
-Emacs looks for the @dfn{closest matching font}.  The variables in
-this section control how Emacs makes this selection.
+Mode}).}.  @xref{Fonts,,, emacs, The GNU Emacs Manual}.  Normally,
+Emacs automatically chooses a font based on the faces assigned to that
+character---specifically, the face attributes @code{:family},
address@hidden:weight}, @code{:slant}, and @code{:width} (@pxref{Face
+Attributes}).  The choice of font also depends on the character to be
+displayed; some fonts can only display a limited set of characters.
+If no available font exactly fits the requirements, Emacs looks for
+the @dfn{closest matching font}.  The variables in this section
+control how Emacs makes this selection.
 
 @defopt face-font-family-alternatives
 If a given family is specified but does not exist, this variable