diff options
| author | Stefan Monnier | 2006-07-17 21:24:17 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-07-17 21:24:17 +0000 |
| commit | e0a0d9fe5c1e9110589a5d164ae1ea04f50a4191 (patch) | |
| tree | c0c36b6cb0b876425d215563bb9a45e251b9b90f /lisp | |
| parent | a6f6840ed839bbc3c5040848db0cf642745a97aa (diff) | |
| download | emacs-e0a0d9fe5c1e9110589a5d164ae1ea04f50a4191.tar.gz emacs-e0a0d9fe5c1e9110589a5d164ae1ea04f50a4191.zip | |
(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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/cus-edit.el | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 15efbc5ab91..0b578358f80 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -2668,7 +2668,18 @@ Otherwise, look up symbol in `custom-guess-type-alist'." | |||
| 2668 | (error nil)) | 2668 | (error nil)) |
| 2669 | (cond | 2669 | (cond |
| 2670 | ((eq (caar tmp) 'user) 'saved) | 2670 | ((eq (caar tmp) 'user) 'saved) |
| 2671 | ((eq (caar tmp) 'changed) 'changed) | 2671 | ((eq (caar tmp) 'changed) |
| 2672 | (if (condition-case nil | ||
| 2673 | (and (null comment) | ||
| 2674 | (equal value | ||
| 2675 | (eval | ||
| 2676 | (car (get symbol 'standard-value))))) | ||
| 2677 | (error nil)) | ||
| 2678 | ;; The value was originally set outside | ||
| 2679 | ;; custom, but it was set to the standard | ||
| 2680 | ;; value (probably an autoloaded defcustom). | ||
| 2681 | 'standard | ||
| 2682 | 'changed)) | ||
| 2672 | (t 'themed)) | 2683 | (t 'themed)) |
| 2673 | 'changed)) | 2684 | 'changed)) |
| 2674 | ((setq tmp (get symbol 'standard-value)) | 2685 | ((setq tmp (get symbol 'standard-value)) |