diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/fontset.c | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index 7057167cfd4..b2c7249625e 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -2229,7 +2229,7 @@ alternate fontnames (if any) are tried instead. */); | |||
| 2229 | 2229 | ||
| 2230 | DEFVAR_LISP ("vertical-centering-font-regexp", | 2230 | DEFVAR_LISP ("vertical-centering-font-regexp", |
| 2231 | Vvertical_centering_font_regexp, | 2231 | Vvertical_centering_font_regexp, |
| 2232 | doc: /* *Regexp matching font names that require vertical centering on display. | 2232 | doc: /* Regexp matching font names that require vertical centering on display. |
| 2233 | When a character is displayed with such fonts, the character is displayed | 2233 | When a character is displayed with such fonts, the character is displayed |
| 2234 | at the vertical center of lines. */); | 2234 | at the vertical center of lines. */); |
| 2235 | Vvertical_centering_font_regexp = Qnil; | 2235 | Vvertical_centering_font_regexp = Qnil; |