aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/xfaces.c2
1 files changed, 1 insertions, 1 deletions
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.")
4562 4562
4563DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face, 4563DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
4564 Sinternal_merge_in_global_face, 2, 2, 0, 4564 Sinternal_merge_in_global_face, 2, 2, 0,
4565 "Add attributes from frame-default definition of FACE to FACE on FRAME. 4565 "Add attributes from frame-default definition of FACE to FACE on FRAME.\n\
4566Default face attributes override any local face attributes.") 4566Default face attributes override any local face attributes.")
4567 (face, frame) 4567 (face, frame)
4568 Lisp_Object face, frame; 4568 Lisp_Object face, frame;