From e6f174da18b24ad158102bf49aa6eb338afd3639 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 19 Oct 2008 11:20:00 +0000 Subject: [PATCH] (dos-reevaluate-defcustoms): Fix last change. --- lisp/dos-fns.el | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index d58beec3897..edcebb1306a 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -200,12 +200,21 @@ shell requires it (see `w32-shell-dos-semantics')." ;; 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) -- 2.39.5