# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 968451437 0
# Node ID 1594b23da7573e24702d3418cc23dc084abac23f
# Parent  7de42ceb8e009ec3a7ada04a96e1cb5a514c61a3
(internal-merge-in-global-face): Fix newline in doc string.

diff -r 7de42ceb8e00 -r 1594b23da757 src/xfaces.c
--- a/src/xfaces.c	Fri Sep 08 21:50:30 2000 +0000
+++ b/src/xfaces.c	Fri Sep 08 22:17:17 2000 +0000
@@ -4562,7 +4562,7 @@
 
 DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
        Sinternal_merge_in_global_face, 2, 2, 0,
-  "Add attributes from frame-default definition of FACE to FACE on FRAME.
+  "Add attributes from frame-default definition of FACE to FACE on FRAME.\n\
 Default face attributes override any local face attributes.")
   (face, frame)
      Lisp_Object face, frame;