[Emacs-diffs] /srv/bzr/emacs/trunk r108635: Minor edits for Face Attributes section of display.texi

[Glenn Morris]

------------------------------------------------------------
revno: 108635
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-16 19:07:26 -0700
message:
  Minor edits for Face Attributes section of display.texi
  
  * display.texi (Face Attributes): Copyedits.  Add a few cindex entries.
  Overlining no longer behaves exactly like underlining.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-06-17 01:42:56 +0000
+++ b/doc/lispref/ChangeLog     2012-06-17 02:07:26 +0000
@@ -1,3 +1,8 @@
+2012-06-17  Glenn Morris  <address@hidden>
+
+       * display.texi (Face Attributes): Copyedits.  Add a few cindex entries.
+       Overlining no longer behaves exactly like underlining.
+
 2012-06-16  Aurelien Aptel  <address@hidden>
 
        * display.texi (Face Attributes):

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2012-06-17 00:32:36 +0000
+++ b/doc/lispref/display.texi  2012-06-17 02:07:26 +0000
@@ -2113,6 +2113,7 @@
 as extra bright, and any weight less than normal is displayed as
 half-bright.
 
address@hidden italic text
 @item :slant
 Font slant---one of the symbols @code{italic}, @code{oblique},
 @code{normal}, @code{reverse-italic}, or @code{reverse-oblique}.  On
@@ -2129,10 +2130,10 @@
 Background color, a string.  The value can be a system-defined color
 name, or a hexadecimal color specification.  @xref{Color Names}.
 
address@hidden underlined text
 @item :underline
 Whether or not characters should be underlined, and in what
-color. Here are the possible values of the @code{:underline}
-attribute, and what they mean:
+way.  The possible values of the @code{:underline} attribute are:
 
 @table @asis
 @item @code{nil}
@@ -2142,28 +2143,29 @@
 Underline with the foreground color of the face.
 
 @item @var{color}
-Underline in color @var{color}.
+Underline in color @var{color}; which should be either a string
+specifying a color, or the symbol @code{foreground-color}, meaning the
+foreground color of the face.
 
 @item @code{(:color @var{color} :style @var{style})}
-If @var{color} is a string, underline in it.
-If @var{color} is @code{foreground-color}, underline with the
-foreground color of the face.
-
-If @var{style} is @code{wave} underline with a wave.
-If @var{style} is @code{line} underline with a line. 
-
-If the attribute @code{:color} is omited, underline with the
-foreground color of the face.
-If the attribute @code{:style} is omited, underline with a line.
address@hidden is as described above.  Omitting the attribute
address@hidden:color} means to use the foreground color of the face.
address@hidden should be a symbol @code{line} or @code{wave}, meaning to
+use a straight or wavy line.  Omitting the attribute @code{:style}
+means to use a straight line.
 @end table
 
address@hidden overlined text
 @item :overline
 Whether or not characters should be overlined, and in what color.
-The value is used like that of @code{:underline}.
+If the value is @code{t}, overlining uses the foreground color of the
+face.  If the value is a string, overlining uses that color.  The
+value @code{nil} means do not overline.
 
address@hidden strike-through text
 @item :strike-through
 Whether or not characters should be strike-through, and in what
-color.  The value is used like that of @code{:underline}.
+color.  The value is used like that of @code{:overline}.
 
 @item :box
 Whether or not a box should be drawn around characters, its color, the