(dos-reevaluate-defcustoms): New function. Add it to before-init-hook.

2 files changed, 16 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 706808fb0a3..dbbd2ecab6b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-19  Eli Zaretskii  <eliz@gnu.org>
 
+        * dos-fns.el (dos-reevaluate-defcustoms): New function.  Add it to
+        before-init-hook.
+
         Fix Bug #1183:
 
         * ediff-diff.el (ediff-exec-process): For buffer jobs, bind
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index cf37cc26d6c..d58beec3897 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -189,7 +189,7 @@ shell requires it (see `w32-shell-dos-semantics')."
 ;; See dos-vars.el for defcustom.
 (defvar msdos-shells)
 
-;;; Override setting chosen at startup.
+;; Override settings chosen at startup.
 (defun set-default-process-coding-system ()
   (setq default-process-coding-system
         (if default-enable-multibyte-characters
@@ -198,6 +198,18 @@ shell requires it (see `w32-shell-dos-semantics')."
 
 (add-hook 'before-init-hook 'set-default-process-coding-system)
 
+;; 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".
+(defun dos-reevaluate-defcustoms ()
+  (custom-reevaluate-setting 'abbrev-file-name)
+  (custom-reevaluate-setting 'calc-settings-file)
+  (custom-reevaluate-setting 'trash-directory))
+
+(add-hook 'before-init-hook 'dos-reevaluate-defcustoms)
+
 (defvar register-name-alist
   '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5)
     (cflag . 6) (flags . 7)