[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/doc/lispref/display.texi,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/doc/lispref/display.texi,v |
Date: |
Tue, 21 Oct 2008 12:14:44 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/10/21 12:14:44
Index: display.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/display.texi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- display.texi 14 Oct 2008 12:46:40 -0000 1.24
+++ display.texi 21 Oct 2008 12:14:44 -0000 1.25
@@ -2217,6 +2217,15 @@
@end example
@end defun
address@hidden face-all-attributes face &optional frame
+This function returns an alist of attributes of @var{face}. The
+elements of the result are name-value pairs of the form
address@hidden@code{(@var{attr-name} . @var{attr-value})}}. Optional argument
address@hidden specifies the frame whose definition of @var{face} to
+return; if omitted or @code{nil}, the returned value describes the
+default attributes of @var{face} for newly created frames.
address@hidden defun
+
@defun merge-face-attribute attribute value1 value2
If @var{value1} is a relative value for the face attribute
@var{attribute}, returns it merged with the underlying value