diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-22 09:27:21 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-22 09:27:21 -0800 |
| commit | 6bfb754c3ee2e0d667d36fb4300e2880715ea895 (patch) | |
| tree | bfa882d420c6da5679f2c54d8d4d20dd1ebe6b2c /src/xterm.c | |
| parent | cb55ccae8be946f1562d74718086a4c8c8308ee5 (diff) | |
| parent | 83187cd900c799865c967620eef3b7c18f3d168f (diff) | |
| download | emacs-6bfb754c3ee2e0d667d36fb4300e2880715ea895.tar.gz emacs-6bfb754c3ee2e0d667d36fb4300e2880715ea895.tar.bz2 emacs-6bfb754c3ee2e0d667d36fb4300e2880715ea895.zip | |
Merge from origin/emacs-26
83187cd (origin/emacs-26) Skip mouse-face overlap check when mouse-fa...
a6d8f2b Fix capitalization of "Mail-Followup-To"
f9640f9 * lisp/progmodes/grep.el (grep-compute-defaults):
3a26c8a Semantic manual fixes
106a9f6 More improvements in the Emacs manual
244db85 * doc/misc/viper.texi (File and Buffer Handling): Add missing...
f0d6a16 Fix documentation of 'x-underline-at-descent-line'
69a8f45 * lisp/textmodes/flyspell.el (flyspell-get-word): Doc fix.
05214c6 Correct variable markup in manuals
355c644 Improve the "Sending Mail" chapter of Emacs manual
Conflicts:
src/nsterm.m
src/w32term.c
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 2371058cd45..0d25c7f1a26 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -13250,6 +13250,8 @@ small font display sizes. */); DEFVAR_BOOL ("x-underline-at-descent-line", x_underline_at_descent_line, doc: /* Non-nil means to draw the underline at the same place as the descent line. +(If `line-spacing' is in effect, that moves the underline lower by +that many pixels.) A value of nil means to draw the underline according to the value of the variable `x-use-underline-position-properties', which is usually at the baseline level. The default value is nil. */); |