2 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf3282f35ec..2559eb3dee0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-29  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * files.el (auto-save-file-name-transforms): Don't run "\\2" via
+        expand-file-name.
+
+        * startup.el (command-line): Recompute auto-save-file-name-transforms
+        using the updated value of temporary-file-directory.
+
 2002-03-29  Simon Marshall  <simon.marshall@misys.com>
 
         * font-lock.el (save-buffer-state): Use make-symbol to bind
diff --git a/lisp/startup.el b/lisp/startup.el
index dd13f1ede3e..bff519156c3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -653,6 +653,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (setq small-temporary-file-directory
         (if (eq system-type 'ms-dos)
             (getenv "TMPDIR")))
+  (setq auto-save-file-name-transforms
+        (list (list "\\`/[^/]*:\\(.+/\\)*\\(.*\\)"
+                    ;; Don't put "\\2" inside expand-file-name, since
+                    ;; it will be transformed to "/2" on DOS/Windows.
+                    (concat (expand-file-name temporary-file-directory)
+                            "\\2"))))
 
   ;; See if we should import version-control from the environment variable.
   (let ((vc (getenv "VERSION_CONTROL")))