diff options
| author | Glenn Morris <[email protected]> | 2013-02-12 20:31:09 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2013-02-12 20:31:09 -0800 |
| commit | 01fcc3a532872b29784a4d888ab9cc1aef0eed01 (patch) | |
| tree | e1fba1dfe3ec5b61ddc3e5e3824e4536b2c39429 /src/font.c | |
| parent | d0009c7351874e853c63ce67cea6103f33afa60b (diff) | |
| parent | 1a359750bbac95fd6bf8fe1233e747a1d26f0082 (diff) | |
Merge from emacs-24; up to 2012-12-17T11:17:[email protected]
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c index bed0ac8caf..5cfac07de7 100644 --- a/src/font.c +++ b/src/font.c @@ -4831,7 +4831,7 @@ where OPENED-NAME is the name used for opening the font, FULL-NAME is the full name of the font, SIZE is the pixelsize of the font, - HEIGHT is the pixel-height of the font (i.e ascent + descent), + HEIGHT is the pixel-height of the font (i.e., ascent + descent), BASELINE-OFFSET is the upward offset pixels from ASCII baseline, RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling how to compose characters. |