aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2006-08-24 20:51:17 +0000
committerKim F. Storm2006-08-24 20:51:17 +0000
commitdaa0e79b0a84b14d29a033d5e005ea186e5b1d6a (patch)
tree504fc0390d97c6c87a97b268833af3735e059742 /src
parentfab45703d34ca5c8c0adea32a1731bc8b73d77db (diff)
downloademacs-daa0e79b0a84b14d29a033d5e005ea186e5b1d6a.tar.gz
emacs-daa0e79b0a84b14d29a033d5e005ea186e5b1d6a.zip
(overline_margin): New variable.
(x_produce_glyphs): Use it. (syms_of_xdisp): DEFVAR_INT it.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 640f7006dd1..4144cf51f6a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -710,6 +710,10 @@ Lisp_Object Vresize_mini_windows;
710 710
711struct buffer *displayed_buffer; 711struct buffer *displayed_buffer;
712 712
713/* Space between overline and text. */
714
715EMACS_INT overline_margin;
716
713/* Value returned from text property handlers (see below). */ 717/* Value returned from text property handlers (see below). */
714 718
715enum prop_handled 719enum prop_handled
@@ -20357,7 +20361,7 @@ x_produce_glyphs (it)
20357 /* If face has an overline, add the height of the overline 20361 /* If face has an overline, add the height of the overline
20358 (1 pixel) and a 1 pixel margin to the character height. */ 20362 (1 pixel) and a 1 pixel margin to the character height. */
20359 if (face->overline_p) 20363 if (face->overline_p)
20360 it->ascent += 2; 20364 it->ascent += overline_margin;
20361 20365
20362 if (it->constrain_row_ascent_descent_p) 20366 if (it->constrain_row_ascent_descent_p)
20363 { 20367 {
@@ -20559,7 +20563,7 @@ x_produce_glyphs (it)
20559 /* If face has an overline, add the height of the overline 20563 /* If face has an overline, add the height of the overline
20560 (1 pixel) and a 1 pixel margin to the character height. */ 20564 (1 pixel) and a 1 pixel margin to the character height. */
20561 if (face->overline_p) 20565 if (face->overline_p)
20562 it->ascent += 2; 20566 it->ascent += overline_margin;
20563 20567
20564 take_vertical_position_into_account (it); 20568 take_vertical_position_into_account (it);
20565 20569
@@ -20834,7 +20838,7 @@ x_produce_glyphs (it)
20834 /* If face has an overline, add the height of the overline 20838 /* If face has an overline, add the height of the overline
20835 (1 pixel) and a 1 pixel margin to the character height. */ 20839 (1 pixel) and a 1 pixel margin to the character height. */
20836 if (face->overline_p) 20840 if (face->overline_p)
20837 it->ascent += 2; 20841 it->ascent += overline_margin;
20838 20842
20839 take_vertical_position_into_account (it); 20843 take_vertical_position_into_account (it);
20840 20844
@@ -24110,6 +24114,12 @@ whose contents depend on various data. */);
24110 doc: /* Inhibit try_cursor_movement display optimization. */); 24114 doc: /* Inhibit try_cursor_movement display optimization. */);
24111 inhibit_try_cursor_movement = 0; 24115 inhibit_try_cursor_movement = 0;
24112#endif /* GLYPH_DEBUG */ 24116#endif /* GLYPH_DEBUG */
24117
24118 DEFVAR_INT ("overline-margin", &overline_margin,
24119 doc: /* *Space between overline and text, in pixels.
24120The default value is 2: the height of the overline (1 pixel) plus 1 pixel
24121margin to the caracter height. */);
24122 overline_margin = 2;
24113} 24123}
24114 24124
24115 24125