Merge from trunk.

[gnu-emacs] / src / fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 4bc2f8806f3164e947112e0907f9ea591c4fae1f..c591d391e9fc170eaa5f170490690e83a5548136 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1756,7 +1756,7 @@ syms_of_fringe (void)
   defsubr (&Sset_fringe_bitmap_face);
 
   DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe,
-    doc: /* *Non-nil means that newline may flow into the right fringe.
+    doc: /* Non-nil means that newline may flow into the right fringe.
 This means that display lines which are exactly as wide as the window
 (not counting the final newline) will only occupy one screen line, by
 showing (or hiding) the final newline in the right fringe; when point