Mercurial > emacs
changeset 31518:1594b23da757
(internal-merge-in-global-face): Fix newline in doc string.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Fri, 08 Sep 2000 22:17:17 +0000 |
| parents | 7de42ceb8e00 |
| children | 5a14247e8e26 |
| files | src/xfaces.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;