Mercurial > emacs

changeset 47089:37900cd8903a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(make-auto-save-file-name, make-backup-file-name-1): Don't use directory-sep-char.
author Richard M. Stallman <rms@gnu.org>
date Wed, 28 Aug 2002 22:16:42 +0000
parents d4f9e484db41
children 9c336e422221
files lisp/files.el
diffstat 1 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/files.el	Wed Aug 28 15:21:33 2002 +0000
+++ b/lisp/files.el	Wed Aug 28 22:16:42 2002 +0000
@@ -2574,7 +2574,7 @@
 (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 dir-sep-string)
+	elt backup-directory)
     (while alist
       (setq elt (pop alist))
       (if (string-match (car elt) file)
@@ -2589,29 +2589,28 @@
       (if (file-name-absolute-p 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".
+	      ;; Normalize DOSish file names: 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
 	      ;; Replace any invalid file-name characters (for the
 	      ;; case of backing up remote files).
 	      (setq file (expand-file-name (convert-standard-filename file)))
-	      (setq dir-sep-string (char-to-string directory-sep-char))
 	      (if (eq (aref file 1) ?:)
-		  (setq file (concat dir-sep-string
+		  (setq file (concat "/"
 				     "drive_"
 				     (char-to-string (downcase (aref file 0)))
-				     (if (eq (aref file 2) directory-sep-char)
+				     (if (eq (aref file 2) ?/)
 					 ""
-				       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)
@@ -3563,7 +3562,7 @@
 		(setq filename (concat
 				(file-name-directory result)
 				(subst-char-in-string
-				 directory-sep-char ?!
+				 ?/ ?!
 				 (replace-regexp-in-string "!" "!!"
 							   filename))))
 	      (setq filename result)))