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

Revert Tramp commit from 2017-11-20

Browse source 
* lisp/net/tramp.el (tramp-drop-volume-letter)
(tramp-handle-find-backup-file-name): Revert change from
2017-11-20.  Emacs' `make-backup-file-name-1' handles this
case now.
This commit is contained in:
Michael Albinus 2017-12-02 12:09:57 +01:00
parent 77cf972592
commit 1b351c8a47
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lisp/net/tramp.el
View file

@ -1858,8 +1858,7 @@ letter into the file name. This function removes it."
(if (tramp-compat-file-name-quoted-p name) (if (tramp-compat-file-name-quoted-p name)
'tramp-compat-file-name-quote 'identity) 'tramp-compat-file-name-quote 'identity)
(let ((name (tramp-compat-file-name-unquote name))) (let ((name (tramp-compat-file-name-unquote name)))
;; A volume letter could occur also in encoded backup file names. (if (string-match "\\`[a-zA-Z]:/" name)
(if (string-match "\\(\\`[[:alpha:]]:/\\|/!drive_[[:alpha:]]\\)" name)
(replace-match "/" nil t name) (replace-match "/" nil t name)
name))))) name)))))
@ -3226,23 +3225,21 @@ User is always nil."
(defun tramp-handle-find-backup-file-name (filename) (defun tramp-handle-find-backup-file-name (filename)
"Like `find-backup-file-name' for Tramp files." "Like `find-backup-file-name' for Tramp files."
(with-parsed-tramp-file-name filename nil (with-parsed-tramp-file-name filename nil
(mapcar (let ((backup-directory-alist
'tramp-drop-volume-letter (if tramp-backup-directory-alist
(let ((backup-directory-alist (mapcar
(if tramp-backup-directory-alist (lambda (x)
(mapcar (cons
(lambda (x) (car x)
(cons (if (and (stringp (cdr x))
(car x) (file-name-absolute-p (cdr x))
(if (and (stringp (cdr x)) (not (tramp-tramp-file-p (cdr x))))
(file-name-absolute-p (cdr x)) (tramp-make-tramp-file-name
(not (tramp-tramp-file-p (cdr x)))) method user domain host port (cdr x) hop)
(tramp-make-tramp-file-name (cdr x))))
method user domain host port (cdr x) hop) tramp-backup-directory-alist)
(cdr x)))) backup-directory-alist)))
tramp-backup-directory-alist) (tramp-run-real-handler 'find-backup-file-name (list filename)))))
backup-directory-alist)))
(tramp-run-real-handler 'find-backup-file-name (list filename))))))
(defun tramp-handle-insert-directory (defun tramp-handle-insert-directory
(filename switches &optional wildcard full-directory-p) (filename switches &optional wildcard full-directory-p)