aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2001-10-17 01:13:10 +0000
committerMiles Bader2001-10-17 01:13:10 +0000
commit3d58b15e0f9c8aaa1a78d6554e85ee4fa34c62a2 (patch)
treef08341e6d90be0dcd00a819263726af08d03c0a3
parentca5b46fc992f621181312ccbac033c18c5d60888 (diff)
downloademacs-3d58b15e0f9c8aaa1a78d6554e85ee4fa34c62a2.tar.gz
emacs-3d58b15e0f9c8aaa1a78d6554e85ee4fa34c62a2.zip
(defface): Mention `:inherit' in doc-string.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/custom.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5af0e44f54..6e64e20391d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12001-10-17 Miles Bader <miles@gnu.org>
2
3 * custom.el (defface): Mention `:inherit' in doc-string.
4
12001-10-16 Eli Zaretskii <eliz@is.elta.co.il> 52001-10-16 Eli Zaretskii <eliz@is.elta.co.il>
2 6
3 * paren.el: Update the Commentary with installation instructions. 7 * paren.el: Update the Commentary with installation instructions.
diff --git a/lisp/custom.el b/lisp/custom.el
index 43c3184469d..f8dd28fc386 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -235,7 +235,7 @@ ATTS is a list of face attributes followed by their values:
235 235
236The possible attributes are `:family', `:width', `:height', `:weight', 236The possible attributes are `:family', `:width', `:height', `:weight',
237`:slant', `:underline', `:overline', `:strike-through', `:box', 237`:slant', `:underline', `:overline', `:strike-through', `:box',
238`:foreground', `:background', `:stipple', and `:inverse-video'. 238`:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'.
239 239
240DISPLAY can either be the symbol t, which will match all frames, or an 240DISPLAY can either be the symbol t, which will match all frames, or an
241alist of the form \((REQ ITEM...)...). For the DISPLAY to match a 241alist of the form \((REQ ITEM...)...). For the DISPLAY to match a