Update AUCTeX

[gnu-emacs] / lisp / custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index ae9d86cab008cd4616045b41753d2257efd754ca..2ddd7ceb9435b57105c015bf2cbc97d2933a7668 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -246,6 +246,13 @@ The following keywords are meaningful:
        Specifies that SYMBOL should be set after the list of variables
         VARIABLES when both have been customized.
 
+If SYMBOL has a local binding, then this form affects the local
+binding.  This is normally not what you want.  Thus, if you need
+to load a file defining variables with this form, or with
+`defvar' or `defconst', you should always load that file
+_outside_ any bindings for these variables.  \(`defvar' and
+`defconst' behave similarly in this respect.)
+
 Read the section about customization in the Emacs Lisp manual for more
 information."
   ;; It is better not to use backquote in this file,
@@ -311,6 +318,11 @@ following REQ are defined:
   Should be an integer, it is compared with the result of
   `display-color-cells'.
 
+`supports' (only match frames that support the specified face attributes)
+  Should be a list of face attributes.  See the documentation for
+  the function `display-supports-face-attributes-p' for more
+  information on exactly how testing is done.
+
 Read the section about customization in the Emacs Lisp manual for more
 information."
   ;; It is better not to use backquote in this file,