Mercurial > emacs
changeset 98874:d42cab7ccc5d
(dos-reevaluate-defcustoms): Fix last change.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 19 Oct 2008 11:20:00 +0000 |
| parents | 7203675678b9 |
| children | 4f060a526ae8 |
| files | lisp/dos-fns.el |
| diffstat | 1 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/dos-fns.el Sun Oct 19 10:21:25 2008 +0000 +++ b/lisp/dos-fns.el Sun Oct 19 11:20:00 2008 +0000 @@ -200,12 +200,21 @@ ;; File names defined in preloaded packages can be incorrect or ;; invalid if long file names were available during dumping, but not -;; at runtime, and the default file name begins with a period. Their -;; defcustom's need to be reevaluated at startup. To update the list -;; of defcustom's below, run the command "M-x apropos-value RET ~/\. RET". +;; at runtime, or vice versa, and if the default file name begins with +;; a period. Their defcustom's need to be reevaluated at startup. To +;; see if the list of defcustom's below is up to date, run the command +;; "M-x apropos-value RET ~/\. RET". (defun dos-reevaluate-defcustoms () - (custom-reevaluate-setting 'abbrev-file-name) - (custom-reevaluate-setting 'calc-settings-file) + ;; This was computed in paths.el, but that was at dump time. + (setq abbrev-file-name + (if (msdos-long-file-names) + "~/.abbrev_defs" + "~/_abbrev.defs")) + ;; This was computed in loaddefs.el, but that was at dump time. + (setq calc-settings-file + (if (msdos-long-file-names) + "~/.calc.el" + "~/_calc.el")) (custom-reevaluate-setting 'trash-directory)) (add-hook 'before-init-hook 'dos-reevaluate-defcustoms)