[Emacs-diffs] Changes to emacs/lisp/dos-fns.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/10/19 11:20:01

Index: dos-fns.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dos-fns.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- dos-fns.el  19 Oct 2008 09:35:32 -0000      1.55
+++ dos-fns.el  19 Oct 2008 11:20:00 -0000      1.56
@@ -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)