(custom-variable-state-set): If the variable was originally set outside

custom, but to the same value as the default, consider it to be standard.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 15efbc5ab9113bd6b0e64bf9c445a449df88c998..0b578358f80e7eef4c326233859f1f67402ac90e 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2668,7 +2668,18 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
                             (error nil))
                           (cond
                            ((eq (caar tmp) 'user) 'saved)
-                           ((eq (caar tmp) 'changed) 'changed)
+                           ((eq (caar tmp) 'changed)
+                             (if (condition-case nil
+                                     (and (null comment)
+                                          (equal value
+                                                 (eval
+                                                  (car (get symbol 'standard-value)))))
+                                   (error nil))
+                                 ;; The value was originally set outside
+                                 ;; custom, but it was set to the standard
+                                 ;; value (probably an autoloaded defcustom).
+                                 'standard
+                               'changed))
                            (t 'themed))
                         'changed))
                      ((setq tmp (get symbol 'standard-value))