diff options
| author | Dave Love | 2000-09-08 22:17:17 +0000 |
|---|---|---|
| committer | Dave Love | 2000-09-08 22:17:17 +0000 |
| commit | 460dc922d8339cb9ef76b76d2dd2ea34dfba4e83 (patch) | |
| tree | d12525c9e3854c4b606be889e92fe20c5d6f2074 /src | |
| parent | 575daf042b4a6871b82540c605b66ae507a448d2 (diff) | |
| download | emacs-460dc922d8339cb9ef76b76d2dd2ea34dfba4e83.tar.gz emacs-460dc922d8339cb9ef76b76d2dd2ea34dfba4e83.zip | |
(internal-merge-in-global-face): Fix newline in doc string.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 2 |
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 | ||
| 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; |