(make-backup-file-name-1) [windowsnt, ms-dos]: Remove

superfluous calls to subst-char-in-string; instead apply
expand-file-name after convert-standard-filename to ensure
expected directory separators are used.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c85834eaf22c93474f366ccf756d3d55a5c34e3c..eb5f45276ab9a9885352d2dfd557fcc482f075c9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-23  Andrew Innes  <andrewi@gnu.org>
+
+       * files.el (make-backup-file-name-1) [windowsnt, ms-dos]: Remove
+       superfluous calls to subst-char-in-string; instead apply
+       expand-file-name after convert-standard-filename to ensure
+       expected directory separators are used.
+
 2000-10-23  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * info.el (Info-file-list-for-emacs): Add an entry for Eshell.

diff --git a/lisp/files.el b/lisp/files.el
index 0cc2f9b6ee687bffe8ba1aedb28ecfae53652934..e0277befbc1c87f41cd789ec39cfa57bead95e71 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2327,12 +2327,8 @@ doesn't exist, it is created."
                  (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 (convert-standard-filename file))
+             (setq file (expand-file-name (convert-standard-filename file)))
              (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_"