*** empty log message ***

3 files changed, 29 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 4b8f564a042..aefb11ccb2d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -839,6 +839,13 @@ The variable `automatic-hscrolling' was renamed to
 the window now works sensibly, by automatically adjusting the window's
 vscroll property.
 
+*** New customize option `overline-margin' controls the space between
+overline and text.
+
+*** New variable `x-underline-at-descent-line' controls the relative
+position of the underline.  When set, it overrides the
+`x-use-underline-position-properties' variables.
+
 +++
 *** The new face `mode-line-inactive' is used to display the mode line
 of non-selected windows.  The `mode-line' face is now used to display
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee84d69391f..72a1bed4397 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-24  Francesc Rocher  <francesc.rocher@gmail.com>
+
+        * cus-start.el (all): Add `overline-margin' and
+        `x-underline-at-descent-line'.
+
 2006-08-24  Kim F. Storm  <storm@cua.dk>
 
         * progmodes/grep.el (grep-find-use-xargs): Use explicit value `exec'
diff --git a/src/ChangeLog b/src/ChangeLog
index 1f570e15a07..cc87d69e070 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,20 @@
-2006-08-25  Nick Roberts  <nickrob@snap.net.nz>
+2006-08-24  Francesc Rocher  <francesc.rocher@gmail.com>
+
+        * xdisp.c (overline_margin): New variable.
+        (x_produce_glyphs): Use it.
+        (syms_of_xdisp): DEFVAR_INT it.
+
+        * xterm.c (x_underline_at_descent_line): New variable.
+        (syms_of_xterm): DEFVAR_BOOL it.
+        (x_draw_glyph_string): Use it.
+        Draw underline and overline up to the end of line if the face
+        extends to the end of line.
+
+        * macterm.c: Likewise.
+
+        * w32term.c: Likewise.
+
+2006-08-24  Nick Roberts  <nickrob@snap.net.nz>
 
         * buffer.c (Fswitch_to_buffer): Move buffer to front of
         buffer-alist if necessary.