diff options
| author | Glenn Morris | 2010-10-23 18:22:37 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-23 18:22:37 -0700 |
| commit | ea88388346b71bef26c5c8b405c2a936f918952e (patch) | |
| tree | 57b5853ea11d84ecc96353f93ead984132855531 /src | |
| parent | 65807d733424d31514780c4e2c7b902e93561126 (diff) | |
| download | emacs-ea88388346b71bef26c5c8b405c2a936f918952e.tar.gz emacs-ea88388346b71bef26c5c8b405c2a936f918952e.zip | |
Sync X and MS-Windows docs for x-use-underline-position-properties.
* src/w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
Sync doc with the xterm.c version.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/w32term.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a0d7d47ce35..dc2c8be43e2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-10-24 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-24 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * w32term.c (syms_of_w32term) <x-use-underline-position-properties>: | ||
| 4 | Sync doc with the xterm.c version. | ||
| 5 | |||
| 3 | * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>: | 6 | * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>: |
| 4 | * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs. | 7 | * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs. |
| 5 | 8 | ||
diff --git a/src/w32term.c b/src/w32term.c index e9865ed7aee..7690f13799f 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -6337,7 +6337,9 @@ the cursor have no effect. */); | |||
| 6337 | doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. | 6337 | doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. |
| 6338 | A value of nil means ignore them. If you encounter fonts with bogus | 6338 | A value of nil means ignore them. If you encounter fonts with bogus |
| 6339 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior | 6339 | UNDERLINE_POSITION font properties, for example 7x13 on XFree prior |
| 6340 | to 4.1, set this to nil. */); | 6340 | to 4.1, set this to nil. You can also use `underline-minimum-offset' |
| 6341 | to override the font's UNDERLINE_POSITION for small font display | ||
| 6342 | sizes. */); | ||
| 6341 | x_use_underline_position_properties = 0; | 6343 | x_use_underline_position_properties = 0; |
| 6342 | 6344 | ||
| 6343 | DEFVAR_BOOL ("x-underline-at-descent-line", | 6345 | DEFVAR_BOOL ("x-underline-at-descent-line", |