aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/faces.el7
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0ab5d2f2f..18605c2735 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2012-01-07 Lars Magne Ingebrigtsen <[email protected]>
+ * faces.el (set-face-attribute): Clarify the meaning of the nil
+ frame (bug#10294).
+
* subr.el (with-selected-frame): Mention that the selected frame
is restored (bug#9980).
diff --git a/lisp/faces.el b/lisp/faces.el
index 86c9c8a669..5d406ad7c0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -557,9 +557,10 @@ If FACE is a face-alias, get the documentation for the target face."
(defun set-face-attribute (face frame &rest args)
"Set attributes of FACE on FRAME from ARGS.
-FRAME nil means change attributes on all frames. FRAME t means change
-the default for new frames (this is done automatically each time an
-attribute is changed on all frames).
+If FRAME is nil this function sets the attributes for all
+existing frames, and the default for new frames. If FRAME is t,
+change the default for new frames (this is done automatically
+each time an attribute is changed on all frames).
ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid
face attribute name. All attributes can be set to `unspecified';