From 460dc922d8339cb9ef76b76d2dd2ea34dfba4e83 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Fri, 8 Sep 2000 22:17:17 +0000 Subject: [PATCH] (internal-merge-in-global-face): Fix newline in doc string. --- src/xfaces.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xfaces.c b/src/xfaces.c index 349f8f9a0f0..ca5632730ea 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4562,7 +4562,7 @@ Value is nil if ATTR doesn't have a discrete set of valid values.") 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; -- 2.39.2