Mercurial > emacs
comparison src/xfaces.c @ 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 | ac6d049932e9 |
children | 5a14247e8e26 |
comparison
equal
deleted
inserted
replaced
31517:7de42ceb8e00 | 31518:1594b23da757 |
---|---|
4560 } | 4560 } |
4561 | 4561 |
4562 | 4562 |
4563 DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face, | 4563 DEFUN ("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\ |
4566 Default face attributes override any local face attributes.") | 4566 Default face attributes override any local face attributes.") |
4567 (face, frame) | 4567 (face, frame) |
4568 Lisp_Object face, frame; | 4568 Lisp_Object face, frame; |
4569 { | 4569 { |
4570 int i; | 4570 int i; |