Merge from trunk.

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 7057167cfd4520d5dc8b88cd0b8b83103608614d..b2c7249625e22ee414feb0f4e1b98a4cd9a9aa7d 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2229,7 +2229,7 @@ alternate fontnames (if any) are tried instead.  */);
 
   DEFVAR_LISP ("vertical-centering-font-regexp",
               Vvertical_centering_font_regexp,
-              doc: /* *Regexp matching font names that require vertical centering on display.
+              doc: /* Regexp matching font names that require vertical centering on display.
 When a character is displayed with such fonts, the character is displayed
 at the vertical center of lines.  */);
   Vvertical_centering_font_regexp = Qnil;