Revert part of last change; it breaks bootstrapping on some systems.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c115c29..dd2ec35 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,7 +10,6 @@
        (image-dired-temp-rotate-image-file):
        * savehist.el (savehist-file):
        * server.el (server-auth-dir):
-       * startup.el (auto-save-list-file-prefix):
        * thumbs.el (thumbs-thumbsdir):
        * tutorial.el (tutorial--saved-dir):
        * play/gamegrid.el (gamegrid-user-score-file-directory): Use it.

diff --git a/lisp/startup.el b/lisp/startup.el
index 84c7341..6185cd5 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -350,9 +350,9 @@ init file is read, in case it sets `mail-host-address'."
 (defcustom auto-save-list-file-prefix
   (cond ((eq system-type 'ms-dos)
         ;; MS-DOS cannot have initial dot, and allows only 8.3 names
-        (locate-user-emacs-file "auto-save.list/_s"))
+        (concat user-emacs-directory "auto-save.list/_s"))
        (t
-        (locate-user-emacs-file "auto-save-list/.saves-")))
+        (concat user-emacs-directory "auto-save-list/.saves-")))
   "Prefix for generating `auto-save-list-file-name'.
 This is used after reading your `.emacs' file to initialize
 `auto-save-list-file-name', by appending Emacs's pid and the system name,