[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110871: * display.texi (Face Attributes): Fix :underline COLOR description.

[Glenn Morris]

------------------------------------------------------------
revno: 110871
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-11-14 22:13:46 -0800
message:
  * display.texi (Face Attributes): Fix :underline COLOR description.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-11-14 08:45:50 +0000
+++ b/doc/lispref/ChangeLog     2012-11-15 06:13:46 +0000
@@ -1,3 +1,7 @@
+2012-11-15  Glenn Morris  <address@hidden>
+
+       * display.texi (Face Attributes): Fix :underline COLOR description.
+
 2012-11-14  Glenn Morris  <address@hidden>
 
        * keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples,

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2012-10-27 05:03:52 +0000
+++ b/doc/lispref/display.texi  2012-11-15 06:13:46 +0000
@@ -2009,12 +2009,11 @@
 Underline with the foreground color of the face.
 
 @item @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.
+Underline in color @var{color}, a string specifying a color.
 
 @item @code{(:color @var{color} :style @var{style})}
address@hidden is as described above.  Omitting the attribute
address@hidden is either a string, or the symbol @code{foreground-color},
+meaning the foreground color of the face.  Omitting the attribute
 @code{:color} means to use the foreground color of the face.
 @var{style} should be a symbol @code{line} or @code{wave}, meaning to
 use a straight or wavy line.  Omitting the attribute @code{:style}