diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-01-08 15:03:57 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-01-08 15:03:57 +0100 |
| commit | 55c5e26307a1e8f1fff74415fc560aa172a421cf (patch) | |
| tree | 1c77551f0c66d934015816622b53601d3b461746 | |
| parent | 2f947ecafd5135c550b8f69c04d93348eed8f142 (diff) | |
| download | emacs-55c5e26307a1e8f1fff74415fc560aa172a421cf.tar.gz | |
Fix nasty cut'n'waste error in Tramp
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
Remove weird code, resulting from cut'n'waste.
| -rw-r--r-- | lisp/net/tramp-sudoedit.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index 6ac20121054..cab9b8d835a 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -44,8 +44,8 @@ (tramp--with-startup (add-to-list 'tramp-methods `(,tramp-sudoedit-method - (tramp-sudo-login (("sudo") ("-u" "%u") ("-S") ("-H") - ("-p" "Password:") ("--"))))) + (tramp-sudo-login (("sudo") ("-u" "%u") ("-S") ("-H") + ("-p" "Password:") ("--"))))) (add-to-list 'tramp-default-user-alist '("\\`sudoedit\\'" nil "root")) @@ -299,8 +299,7 @@ absolute file names." (with-parsed-tramp-file-name newname v2 (tramp-flush-file-properties v2 (file-name-directory v2-localname)) - (tramp-flush-file-properties v2 v2-localname) - (when (tramp-rclone-file-name-p newname)))))))) + (tramp-flush-file-properties v2 v2-localname))))))) (defun tramp-sudoedit-handle-copy-file (filename newname &optional ok-if-already-exists keep-date @@ -453,7 +452,7 @@ the result will be a local, non-Tramp, file name." (delq nil (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))))))))) (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))) (range (and (stringp (nth 3 context)) (nth 3 context)))) (when (tramp-sudoedit-send-command - v "chcon" + v "chcon" (when user (format "--user=%s" user)) (when role (format "--role=%s" role)) (when type (format "--type=%s" type)) |