From: Andrew Innes Date: Mon, 23 Oct 2000 17:40:16 +0000 (+0000) Subject: (make-backup-file-name-1) [windowsnt, ms-dos]: Remove X-Git-Tag: emacs-pretest-21.0.90~657 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=446c097e30de5509ef33a5432febcc28a4e680cf;p=emacs.git (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 c85834eaf22..eb5f45276ab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2000-10-23 Andrew Innes + + * 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 * info.el (Info-file-list-for-emacs): Add an entry for Eshell. diff --git a/lisp/files.el b/lisp/files.el index 0cc2f9b6ee6..e0277befbc1 100644 --- 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_"