(describe-variable): Fix test for customizability.

diff --git a/lisp/help.el b/lisp/help.el
index b0ca05a747447672f1d8e33fcf97ec574643ffd8..d2da9a55b5ab1208a219ebb8cef5b727476479cf 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -768,9 +768,9 @@ Returns the documentation as a string, also."
          ;; Note, it is not reliable to test only for a custom-type property
          ;; because those are only present after the var's definition
          ;; has been loaded.
-         (if (or (user-variable-p variable)
-                 (get variable 'custom-loads)
-                 (get variable 'custom-type))
+         (if (or (get variable 'custom-type) ; after defcustom
+                 (get variable 'custom-loads) ; from loaddefs.el
+                 (get variable 'standard-value)) ; from cus-start.el
              (let ((customize-label "customize"))
                (terpri)
                (terpri)