(custom-display): Use correct syntax for `supports' attributes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68c428f29f25e8d2cc977ca441986e838a010ba5..328809035ca333a0b524ab7980b1d384551bdf61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
        * faces.el (display-supports-face-attributes-p): New function.
        (face-spec-set-match-display): Support `supports' predicate.
        (italic): Try underlining for displays that don't support real italics.
+       * cus-edit.el (custom-display): Add support for `supports' predicate.
        * term/tty-colors.el (color-name-rgb-alist): Use 16-bit RGB values
        instead of 8-bit, for consistency with the rest of emacs.
        (tty-color-canonicalize): Only copy COLOR if we need to change it.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d09d39733b37bdc3fd84c9c72fafe25e2f797614..d6d82f34c2e046ed9395e950bc491e202bcbc00d 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2631,7 +2631,7 @@ Match frames with dark backgrounds.")
                  (group :sibling-args (:help-echo "\
 Only match frames that support the specified face attributes.")
                         (const :format "Supports attributes:" supports)
-                        (custom-face-edit :format "%n%v"))))))
+                        (custom-face-edit :inline t :format "%n%v"))))))
 
 ;;; The `custom-face' Widget.