aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-11-14 22:13:46 -0800
committerGlenn Morris2012-11-14 22:13:46 -0800
commitc79c7f2f4f3967ec03120cdc53e0e864e1ff7176 (patch)
treea6aed3aef5dd88f2fae2558cef76d040ba4ce421
parentdc26b31073f26baf3c84a11106127dc083d6eeb5 (diff)
downloademacs-c79c7f2f4f3967ec03120cdc53e0e864e1ff7176.tar.gz
emacs-c79c7f2f4f3967ec03120cdc53e0e864e1ff7176.zip
* display.texi (Face Attributes): Fix :underline COLOR description.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/display.texi7
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e5320bf9343..d05f48b9f2d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12012-11-15 Glenn Morris <rgm@gnu.org>
2
3 * display.texi (Face Attributes): Fix :underline COLOR description.
4
12012-11-14 Glenn Morris <rgm@gnu.org> 52012-11-14 Glenn Morris <rgm@gnu.org>
2 6
3 * keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples, 7 * keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples,
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 68701a47126..6c77a9937d7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2009,12 +2009,11 @@ Don't underline.
2009Underline with the foreground color of the face. 2009Underline with the foreground color of the face.
2010 2010
2011@item @var{color} 2011@item @var{color}
2012Underline in color @var{color}; which should be either a string 2012Underline in color @var{color}, a string specifying a color.
2013specifying a color, or the symbol @code{foreground-color}, meaning the
2014foreground color of the face.
2015 2013
2016@item @code{(:color @var{color} :style @var{style})} 2014@item @code{(:color @var{color} :style @var{style})}
2017@var{color} is as described above. Omitting the attribute 2015@var{color} is either a string, or the symbol @code{foreground-color},
2016meaning the foreground color of the face. Omitting the attribute
2018@code{:color} means to use the foreground color of the face. 2017@code{:color} means to use the foreground color of the face.
2019@var{style} should be a symbol @code{line} or @code{wave}, meaning to 2018@var{style} should be a symbol @code{line} or @code{wave}, meaning to
2020use a straight or wavy line. Omitting the attribute @code{:style} 2019use a straight or wavy line. Omitting the attribute @code{:style}