diff options
author | Alp Aker <alp.tekin.aker@gmail.com> | 2012-06-16 20:32:36 -0400 |
---|---|---|
committer | Alp Aker <alp.tekin.aker@gmail.com> | 2012-06-16 20:32:36 -0400 |
commit | 9b0e3ebaef5aed8097965b14c97a0579763be7fd (patch) | |
tree | eeabc5495c58289454d9c53c9dd409377ec72cf3 /lisp/cus-face.el | |
parent | 40d8bcb854203237c6ad8327bc1fc0644f8734ec (diff) | |
download | emacs-9b0e3ebaef5aed8097965b14c97a0579763be7fd.tar.gz |
Implement wave-style variant of underlining.
* doc/lispref/display.texi: Document new face attribute.
* lisp/cus-face.el (custom-face-attributes): Add wave-style underline
attribute.
* lisp/faces.el (set-face-attribute): Update docstring.
* src/dispextern.h (face_underline_type): New enum.
(face): Add field for underline type.
* src/nsterm.m (ns_draw_underwave): New function.
(ns_draw_text_decoration): Use it.
* src/w32term.c (w32_restore_glyph_string_clip, w32_draw_underwave):
New functions.
(x_draw_glyph_string): Use them.
* src/xfaces.c (Qline, Qwave): New Lisp objects.
(check_lface_attrs, merge_face_ref)
(Finternal_set_lisp_face_attribute, realize_x_face): Handle
wave-style underline face attributes.
* src/xterm.c (x_draw_underwave): New function.
(x_draw_glyph_string): Use it.
Diffstat (limited to 'lisp/cus-face.el')
-rw-r--r-- | lisp/cus-face.el | 9 |
1 files changed, 7 insertions, 2 deletions
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" |