summaryrefslogtreecommitdiff
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2000-09-08 22:17:17 +0000
committerDave Love <fx@gnu.org>2000-09-08 22:17:17 +0000
commit460dc922d8339cb9ef76b76d2dd2ea34dfba4e83 (patch)
treed12525c9e3854c4b606be889e92fe20c5d6f2074 /src/xfaces.c
parent575daf042b4a6871b82540c605b66ae507a448d2 (diff)
downloademacs-460dc922d8339cb9ef76b76d2dd2ea34dfba4e83.tar.gz
(internal-merge-in-global-face): Fix newline in doc string.
Diffstat (limited to 'src/xfaces.c')
-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.")
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;