diff options
| author | Eli Zaretskii | 2018-02-21 06:20:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-02-21 06:20:58 +0200 |
| commit | f0d6a16d744c133166cf203daf478e14d53e4e8c (patch) | |
| tree | 8f685cb9b87bcb506a9988129025617394ef4a0d /src | |
| parent | 69a8f45e15e8fcd73062e810886b0d0993442b06 (diff) | |
| download | emacs-f0d6a16d744c133166cf203daf478e14d53e4e8c.tar.gz emacs-f0d6a16d744c133166cf203daf478e14d53e4e8c.zip | |
Fix documentation of 'x-underline-at-descent-line'
* doc/emacs/display.texi (Display Custom):
* src/nsterm.m (syms_of_nsterm):
* src/xterm.c (syms_of_xterm):
* src/w32term.c (syms_of_w32term): Mention the effect of
'line-spacing' on the underline position. (Bug#30553)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 2 | ||||
| -rw-r--r-- | src/w32term.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 51a53828b5b..3d58cd5ec64 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -9381,6 +9381,8 @@ to 4.1, set this to nil. */); | |||
| 9381 | DEFVAR_BOOL ("x-underline-at-descent-line", | 9381 | DEFVAR_BOOL ("x-underline-at-descent-line", |
| 9382 | x_underline_at_descent_line, | 9382 | x_underline_at_descent_line, |
| 9383 | doc: /* Non-nil means to draw the underline at the same place as the descent line. | 9383 | doc: /* Non-nil means to draw the underline at the same place as the descent line. |
| 9384 | (If `line-spacing' is in effect, that moves the underline lower by | ||
| 9385 | that many pixels.) | ||
| 9384 | A value of nil means to draw the underline according to the value of the | 9386 | A value of nil means to draw the underline according to the value of the |
| 9385 | variable `x-use-underline-position-properties', which is usually at the | 9387 | variable `x-use-underline-position-properties', which is usually at the |
| 9386 | baseline level. The default value is nil. */); | 9388 | baseline level. The default value is nil. */); |
diff --git a/src/w32term.c b/src/w32term.c index ac29bbbbd46..611b7c66e7a 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -7401,6 +7401,8 @@ sizes. */); | |||
| 7401 | DEFVAR_BOOL ("x-underline-at-descent-line", | 7401 | DEFVAR_BOOL ("x-underline-at-descent-line", |
| 7402 | x_underline_at_descent_line, | 7402 | x_underline_at_descent_line, |
| 7403 | doc: /* Non-nil means to draw the underline at the same place as the descent line. | 7403 | doc: /* Non-nil means to draw the underline at the same place as the descent line. |
| 7404 | (If `line-spacing' is in effect, that moves the underline lower by | ||
| 7405 | that many pixels.) | ||
| 7404 | A value of nil means to draw the underline according to the value of the | 7406 | A value of nil means to draw the underline according to the value of the |
| 7405 | variable `x-use-underline-position-properties', which is usually at the | 7407 | variable `x-use-underline-position-properties', which is usually at the |
| 7406 | baseline level. The default value is nil. */); | 7408 | baseline level. The default value is nil. */); |
diff --git a/src/xterm.c b/src/xterm.c index b10664dda97..c5163aa990a 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -13260,6 +13260,8 @@ sizes. */); | |||
| 13260 | DEFVAR_BOOL ("x-underline-at-descent-line", | 13260 | DEFVAR_BOOL ("x-underline-at-descent-line", |
| 13261 | x_underline_at_descent_line, | 13261 | x_underline_at_descent_line, |
| 13262 | doc: /* Non-nil means to draw the underline at the same place as the descent line. | 13262 | doc: /* Non-nil means to draw the underline at the same place as the descent line. |
| 13263 | (If `line-spacing' is in effect, that moves the underline lower by | ||
| 13264 | that many pixels.) | ||
| 13263 | A value of nil means to draw the underline according to the value of the | 13265 | A value of nil means to draw the underline according to the value of the |
| 13264 | variable `x-use-underline-position-properties', which is usually at the | 13266 | variable `x-use-underline-position-properties', which is usually at the |
| 13265 | baseline level. The default value is nil. */); | 13267 | baseline level. The default value is nil. */); |