diff options
| author | Paul Eggert | 2011-11-13 20:35:22 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-13 20:35:22 -0800 |
| commit | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch) | |
| tree | e707b79a846623490feea39a4dceb86dd218eb4d /etc | |
| parent | 6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff) | |
| parent | 56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff) | |
| download | emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip | |
Merge from trunk.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS.20 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/NEWS.20 b/etc/NEWS.20 index c76ddb2485e..f4cfb14de62 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 | |||
| @@ -2047,7 +2047,7 @@ standard fontset are created automatically. | |||
| 2047 | 2047 | ||
| 2048 | If you specify a default ASCII font with the `Font' resource or `-fn' | 2048 | If you specify a default ASCII font with the `Font' resource or `-fn' |
| 2049 | argument, a fontset is generated from it. This works by replacing the | 2049 | argument, a fontset is generated from it. This works by replacing the |
| 2050 | FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name | 2050 | FOUNDRY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name |
| 2051 | with `*' then using this to specify a fontset. This fontset's short | 2051 | with `*' then using this to specify a fontset. This fontset's short |
| 2052 | name is `fontset-startup'. | 2052 | name is `fontset-startup'. |
| 2053 | 2053 | ||