(make-backup-file-name-1): Replace slashes with `!'

rather than `|' (which is not allowed on Windows).  Replace the
drive letters with a string "drive_X".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78ae669dfc7052ef2bc40c949506423ea25d61ff..f778179b87f970d2eb887e083113b1838057eda1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * files.el (make-backup-file-name-1): Replace slashes with `!'
+       rather than `|' (which is not allowed on Windows).  Replace the
+       drive letters with a string "drive_X".
+
 2000-05-23  Gerd Moellmann  <gerd@gnu.org>
 
        * progmodes/sh-script.el (sh-ancestor-alist): Add `bash2'.

diff --git a/lisp/files.el b/lisp/files.el
index 0758247b603f35a43451c2fdaa5d25440577736b..b56d15aeafbb396d3241174766e70fbf66f898ed 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2231,7 +2231,7 @@ names matching REGEXP will be made in DIRECTORY.  DIRECTORY may be
 relative or absolute.  If it is absolute, so that all matching files
 are backed up into the same directory, the file names in this
 directory will be the full name of the file backed up with all
-directory separators changed to `|' to prevent clashes.  This will not
+directory separators changed to `!' to prevent clashes.  This will not
 work correctly if your filesystem truncates the resulting name.
 
 For the common case of all backups going into one directory, the alist
@@ -2274,7 +2274,7 @@ doesn't exist, it is created."
 (defun make-backup-file-name-1 (file)
   "Subroutine of `make-backup-file-name' and `find-backup-file-name'."
   (let ((alist backup-directory-alist)
-       elt backup-directory)
+       elt backup-directory dir-sep-string)
     (while alist
       (setq elt (pop alist))
       (if (string-match (car elt) file)
@@ -2287,14 +2287,34 @@ doesn't exist, it is created."
            (make-directory backup-directory 'parents)
          (file-error file)))
       (if (file-name-absolute-p backup-directory)
-         ;; Make the name unique by substituting directory
-         ;; separators.  It may not really be worth bothering about
-         ;; doubling `|'s in the original name...
-         (expand-file-name
-          (subst-char-in-string
-           directory-sep-char ?|
-           (replace-regexp-in-string "|" "||" file))
-          backup-directory)
+         (progn
+           (when (memq system-type '(windows-nt ms-dos))
+             ;; Normalize DOSish file names: convert all slashes to
+             ;; directory-sep-char, downcase the drive letter, if any,
+             ;; and replace the leading "x:" with "/drive_x".
+             (or (file-name-absolute-p file)
+                 (setq file (expand-file-name file))) ; make defaults explicit
+             (setq dir-sep-string (char-to-string directory-sep-char))
+             (or (eq directory-sep-char ?/)
+                 (subst-char-in-string ?/ ?\\ file))
+             (or (eq directory-sep-char ?\\)
+                 (subst-char-in-string ?\\ ?/ file))
+             (if (eq (aref file 1) ?:)
+                 (setq file (concat dir-sep-string
+                                    "drive_"
+                                    (char-to-string (downcase (aref file 0)))
+                                    (if (eq (aref file 2) directory-sep-char)
+                                        ""
+                                      dir-sep-string)
+                                    (substring file 2)))))
+           ;; Make the name unique by substituting directory
+           ;; separators.  It may not really be worth bothering about
+           ;; doubling `!'s in the original name...
+           (expand-file-name
+            (subst-char-in-string
+             directory-sep-char ?!
+             (replace-regexp-in-string "!" "!!" file))
+            backup-directory))
        (expand-file-name (file-name-nondirectory file)
                          (file-name-as-directory
                           (expand-file-name backup-directory