[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 55c5e26: Fix nasty cut'n'waste error in Tramp

From: Michael Albinus
Subject: [Emacs-diffs] master 55c5e26: Fix nasty cut'n'waste error in Tramp
Date: Tue, 8 Jan 2019 09:04:04 -0500 (EST)

branch: master
commit 55c5e26307a1e8f1fff74415fc560aa172a421cf
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
 lisp/net/tramp-sudoedit.el | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el
index 6ac2012..cab9b8d 100644
--- a/lisp/net/tramp-sudoedit.el
+++ b/lisp/net/tramp-sudoedit.el
@@ -44,8 +44,8 @@
  (add-to-list 'tramp-methods
-                (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
             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."
-           (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))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]