[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lispref/display.texi,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lispref/display.texi,v |
Date: |
Sat, 29 Jul 2006 02:26:45 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 06/07/29 02:26:45
Index: display.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/display.texi,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- display.texi 21 Jul 2006 12:22:32 -0000 1.237
+++ display.texi 29 Jul 2006 02:26:45 -0000 1.238
@@ -1857,9 +1857,9 @@
The effect of using a face is determined by a fixed set of @dfn{face
attributes}. This table lists all the face attributes, and what they
-mean. Note that in general, more than one face can be specified for a
-given piece of text; when that happens, the attributes of all the faces
-are merged to specify how to display the text. @xref{Displaying Faces}.
+mean. You can specify more than one face for a given piece of text;
+Emacs merges the attributes of all the faces to determine how to
+display the text. @xref{Displaying Faces}.
Any attribute in a face can have the value @code{unspecified}. This
means the face doesn't specify that attribute. In face merging, when
@@ -2054,9 +2054,9 @@
new frames.
@defun set-face-attribute face frame &rest arguments
-This function sets one or more attributes of face @var{face}
-for frame @var{frame}. If @var{frame} is @code{nil}, it sets
-the attribute for all frames, and the defaults for new frames.
+This function sets one or more attributes of face @var{face} for frame
address@hidden The attributes you specify this way override whatever
+the @code{defface} says.
The extra arguments @var{arguments} specify the attributes to set, and
the values for them. They should consist of alternating attribute names
@@ -2073,6 +2073,11 @@
@noindent
sets the attributes @code{:width}, @code{:weight} and @code{:underline}
to the corresponding values.
+
+If @var{frame} is @code{t}, this function sets the attributes for all
+existing frames, and sets defaults that will apply for new frames.
+Default attribute values specified this way override the
address@hidden for newly created frames.
@end defun
@defun face-attribute face attribute &optional frame inherit
@@ -2080,8 +2085,10 @@
@var{face} on @var{frame}. If @var{frame} is @code{nil},
that means the selected frame (@pxref{Input Focus}).
-If @var{frame} is @code{t}, the value is the default for
address@hidden for new frames.
+If @var{frame} is @code{t}, this returns whatever new-frames default
+value you previously specified with @code{set-face-attribute} for the
address@hidden attribute of @var{face}. If you have not specified
+one, it returns @code{nil}.
If @var{inherit} is @code{nil}, only attributes directly defined by
@var{face} are considered, so the return value may be
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, (continued)
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Kim F. Storm, 2006/07/08
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Richard M. Stallman, 2006/07/08
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Richard M. Stallman, 2006/07/09
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Nick Roberts, 2006/07/09
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Kim F. Storm, 2006/07/10
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Nick Roberts, 2006/07/13
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Richard M. Stallman, 2006/07/17
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Kim F. Storm, 2006/07/18
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Richard M. Stallman, 2006/07/18
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Kim F. Storm, 2006/07/21
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v,
Richard M. Stallman <=
- [Emacs-diffs] Changes to emacs/lispref/display.texi,v, Richard M. Stallman, 2006/07/31