(normal-top-level): Set auto-save-list-file-name later,

after calling command-line.

diff --git a/lisp/startup.el b/lisp/startup.el
index 987bb8b781483a845ca996d381389226e8261352..d02593d61e0c28a910dee03e61d04100909b9750 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -275,19 +275,19 @@ this prefix to create a unique file name.")
                           (delete (concat "PWD=" pwd)
                                   process-environment)))))))
     (setq default-directory (abbreviate-file-name default-directory))
-    ;; Specify the file for recording all the auto save files of this session.
-    ;; This is used by recover-session.
-    (setq auto-save-list-file-name
-         (expand-file-name
-          (format "%s%d-%s"
-                  auto-save-list-file-prefix
-                  (emacs-pid)
-                  (system-name))))
     (let ((menubar-bindings-done nil))
       (unwind-protect
          (command-line)
        ;; Do this again, in case .emacs defined more abbreviations.
        (setq default-directory (abbreviate-file-name default-directory))
+       ;; Specify the file for recording all the auto save files of this session.
+       ;; This is used by recover-session.
+       (setq auto-save-list-file-name
+             (expand-file-name
+              (format "%s%d-%s"
+                      auto-save-list-file-prefix
+                      (emacs-pid)
+                      (system-name))))
        (run-hooks 'emacs-startup-hook)
        (and term-setup-hook
             (run-hooks 'term-setup-hook))