diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/cus-face.el | 9 | ||||
| -rw-r--r-- | lisp/faces.el | 19 |
3 files changed, 29 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee7f2562185..ddc8f9b5a7e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com> + + * cus-face.el (custom-face-attributes): Add wave-style underline + attribute. + * faces.el (set-face-attribute): Update docstring to describe + wave-style underline attribute. + 2012-06-16 Chong Yidong <cyd@gnu.org> * term/xterm.el (terminal-init-xterm): Discard input before diff --git a/lisp/cus-face.el b/lisp/cus-face.el index d725111b6fd..3680a2648ce 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -135,8 +135,13 @@ (choice :tag "Underline" :help-echo "Control text underlining." (const :tag "Off" nil) - (const :tag "On" t) - (color :tag "Colored"))) + (list :tag "On" + (const :format "" :value :color) + (choice :tag "Color" (const :tag "Foreground Color" foreground-color) color) + (const :format "" :value :style) + (choice :tag "Style" + (const :tag "Line" line) + (const :tag "Wave" wave))))) (:overline (choice :tag "Overline" diff --git a/lisp/faces.el b/lisp/faces.el index 0c1eab474c3..40b45187f6c 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -623,10 +623,21 @@ VALUE must be a color name, a string. `:underline' -VALUE specifies whether characters in FACE should be underlined. If -VALUE is t, underline with foreground color of the face. If VALUE is -a string, underline with that color. If VALUE is nil, explicitly -don't underline. +VALUE specifies whether characters in FACE should be underlined. +If VALUE is t, underline with foreground color of the face. +If VALUE is a string, underline with that color. +If VALUE is nil, explicitly don't underline. + +Otherwise, VALUE must be a property list of the form: + +`(:color COLOR :style STYLE)'. + +COLOR can be a either a color name string or `foreground-color'. +STYLE can be either `line' or `wave'. +If a keyword/value pair is missing from the property list, a +default value will be used for the value. +The default value of COLOR is the foreground color of the face. +The default value of STYLE is `line'. `:overline' |