diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/custom.el | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eff83cb8460..e1038b89072 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-01-25 Chong Yidong <cyd@gnu.org> + + * custom.el (custom-variable-p): Doc fix. + 2012-01-25 Glenn Morris <rgm@gnu.org> * progmodes/compile.el (compilation-next-error-function): diff --git a/lisp/custom.el b/lisp/custom.el index 2ccfe094933..132576ac6e2 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -591,8 +591,10 @@ If NOSET is non-nil, don't bother autoloading LOAD when setting the variable." ;; This test is also in the C code of `user-variable-p'. (defun custom-variable-p (variable) - "Return non-nil if VARIABLE is a custom variable. -This recursively follows aliases." + "Return non-nil if VARIABLE is a customizable variable. +A customizable variable is either (i) a variable whose property +list contains a non-nil `standard-value' or `custom-autoload' +property, or (ii) an alias for another customizable variable." (setq variable (indirect-variable variable)) (or (get variable 'standard-value) (get variable 'custom-autoload))) |