mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

Fix nasty cut'n'waste error in Tramp

Browse Source 
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
Remove weird code, resulting from cut'n'waste.
This commit is contained in:
Michael Albinus 2019-01-08 15:03:57 +01:00
parent 2f947ecafd
commit 55c5e26307
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/net/tramp-sudoedit.el
View File

@ -44,8 +44,8 @@
(tramp--with-startup (tramp--with-startup
(add-to-list 'tramp-methods (add-to-list 'tramp-methods
`(,tramp-sudoedit-method `(,tramp-sudoedit-method
(tramp-sudo-login (("sudo") ("-u" "%u") ("-S") ("-H") (tramp-sudo-login (("sudo") ("-u" "%u") ("-S") ("-H")
("-p" "Password:") ("--"))))) ("-p" "Password:") ("--")))))
(add-to-list 'tramp-default-user-alist '("\\`sudoedit\\'" nil "root")) (add-to-list 'tramp-default-user-alist '("\\`sudoedit\\'" nil "root"))
@ -299,8 +299,7 @@ absolute file names."
(with-parsed-tramp-file-name newname v2 (with-parsed-tramp-file-name newname v2
(tramp-flush-file-properties (tramp-flush-file-properties
v2 (file-name-directory v2-localname)) v2 (file-name-directory v2-localname))
(tramp-flush-file-properties v2 v2-localname) (tramp-flush-file-properties v2 v2-localname)))))))
(when (tramp-rclone-file-name-p newname))))))))
(defun tramp-sudoedit-handle-copy-file (defun tramp-sudoedit-handle-copy-file
(filename newname &optional ok-if-already-exists keep-date (filename newname &optional ok-if-already-exists keep-date
@ -453,7 +452,7 @@ the result will be a local, non-Tramp, file name."
(delq (delq
nil nil
(mapcar (mapcar
(lambda (l) (and (not (string-match-p "^[[:space:]]*$" l)) l)) (lambda (l) (and (not (string-match-p "^[[:space:]]*$" l)) l))
(split-string (buffer-string) "\n" 'omit))))))))) (split-string (buffer-string) "\n" 'omit)))))))))
(defun tramp-sudoedit-handle-file-readable-p (filename) (defun tramp-sudoedit-handle-file-readable-p (filename)
@ -675,7 +674,7 @@ component is used as the target of the symlink."
(type (and (stringp (nth 2 context)) (nth 2 context))) (type (and (stringp (nth 2 context)) (nth 2 context)))
(range (and (stringp (nth 3 context)) (nth 3 context)))) (range (and (stringp (nth 3 context)) (nth 3 context))))
(when (tramp-sudoedit-send-command (when (tramp-sudoedit-send-command
v "chcon" v "chcon"
(when user (format "--user=%s" user)) (when user (format "--user=%s" user))
(when role (format "--role=%s" role)) (when role (format "--role=%s" role))
(when type (format "--type=%s" type)) (when type (format "--type=%s" type))