procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Fix backing up remote files in local directories on MS-Windows"

Browse source 
This reverts commit 8c8b673288.
This commit is contained in:
John Wiegley 2017-12-01 12:42:58 -08:00
parent f52d79500b
commit 1e25cd79ff
1 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lisp/files.el
View file

@ -4653,24 +4653,8 @@ The function `find-backup-file-name' also uses this."
;; "/drive_x". ;; "/drive_x".
(or (file-name-absolute-p file) (or (file-name-absolute-p file)
(setq file (expand-file-name file))) ; make defaults explicit (setq file (expand-file-name file))) ; make defaults explicit
(cond ;; Replace any invalid file-name characters (for the
((file-remote-p file) ;; case of backing up remote files).
;; Remove the leading slash, if any, to prevent
;; expand-file-name from adding a drive letter.
(and (memq (aref file 0) '(?/ ?\\))
(setq file (substring file 1)))
;; Replace any invalid file-name characters.
(setq file (convert-standard-filename file))
;; Replace slashes to make the file name unique, and
;; prepend backup-directory.
(expand-file-name
(subst-char-in-string
?/ ?!
(replace-regexp-in-string "!" "!!"
(concat "/" file)))
backup-directory))
(t
;; Replace any invalid file-name characters.
(setq file (expand-file-name (convert-standard-filename file))) (setq file (expand-file-name (convert-standard-filename file)))
(if (eq (aref file 1) ?:) (if (eq (aref file 1) ?:)
(setq file (concat "/" (setq file (concat "/"
@ -4679,7 +4663,7 @@ The function `find-backup-file-name' also uses this."
(if (eq (aref file 2) ?/) (if (eq (aref file 2) ?/)
"" ""
"/") "/")
(substring file 2)))) (substring file 2)))))
;; Make the name unique by substituting directory ;; Make the name unique by substituting directory
;; separators. It may not really be worth bothering about ;; separators. It may not really be worth bothering about
;; doubling `!'s in the original name... ;; doubling `!'s in the original name...
@ -4687,7 +4671,7 @@ The function `find-backup-file-name' also uses this."
(subst-char-in-string (subst-char-in-string
?/ ?! ?/ ?!
(replace-regexp-in-string "!" "!!" file)) (replace-regexp-in-string "!" "!!" file))
backup-directory))))) backup-directory))
(expand-file-name (file-name-nondirectory file) (expand-file-name (file-name-nondirectory file)
(file-name-as-directory abs-backup-directory)))))) (file-name-as-directory abs-backup-directory))))))