changeset 99112:9c18e435ac9b

Revert part of last change; it breaks bootstrapping on some systems.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 24 Oct 2008 22:50:13 +0000
parents 4c0755112d27
children e4220bce0895
files lisp/ChangeLog lisp/startup.el
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Oct 24 19:00:42 2008 +0000
+++ b/lisp/ChangeLog	Fri Oct 24 22:50:13 2008 +0000
@@ -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.
--- a/lisp/startup.el	Fri Oct 24 19:00:42 2008 +0000
+++ b/lisp/startup.el	Fri Oct 24 22:50:13 2008 +0000
@@ -350,9 +350,9 @@
 (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,