[Emacs-diffs] master f9beb2b: Work on Tramp backward compatibility

[Michael Albinus]

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

    Work on Tramp backward compatibility
    
    * lisp/net/tramp-adb.el (tramp-adb-handle-copy-file)
    (tramp-adb-handle-rename-file):
    * lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
    * lisp/net/tramp-rclone.el (tramp-rclone-do-copy-or-rename-file):
    * lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file):
    * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file)
    (tramp-smb-handle-rename-file):
    * lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
    Use `tramp-compat-directory-name-p'.
---
 lisp/net/tramp-adb.el      | 6 ++++--
 lisp/net/tramp-gvfs.el     | 3 ++-
 lisp/net/tramp-rclone.el   | 3 ++-
 lisp/net/tramp-sh.el       | 3 ++-
 lisp/net/tramp-smb.el      | 5 +++--
 lisp/net/tramp-sudoedit.el | 3 ++-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 475f9a2..2192f7f 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -704,7 +704,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
       (with-parsed-tramp-file-name (if t1 filename newname) nil
        (when (and (not ok-if-already-exists) (file-exists-p newname))
          (tramp-error v 'file-already-exists newname))
-       (when (and (file-directory-p newname) (not (directory-name-p newname)))
+       (when (and (file-directory-p newname)
+                  (not (tramp-compat-directory-name-p newname)))
          (tramp-error v 'file-error "File is a directory %s" newname))
 
        (with-tramp-progress-reporter
@@ -781,7 +782,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
       (with-parsed-tramp-file-name (if t1 filename newname) nil
        (when (and (not ok-if-already-exists) (file-exists-p newname))
          (tramp-error v 'file-already-exists newname))
-       (when (and (file-directory-p newname) (not (directory-name-p newname)))
+       (when (and (file-directory-p newname)
+                  (not (tramp-compat-directory-name-p newname)))
          (tramp-error v 'file-error "File is a directory %s" newname))
 
        (with-tramp-progress-reporter
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 8cec587..f10476a 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -766,7 +766,8 @@ file names."
       (with-parsed-tramp-file-name (if t1 filename newname) nil
        (when (and (not ok-if-already-exists) (file-exists-p newname))
          (tramp-error v 'file-already-exists newname))
-       (when (and (file-directory-p newname) (not (directory-name-p newname)))
+       (when (and (file-directory-p newname)
+                  (not (tramp-compat-directory-name-p newname)))
          (tramp-error v 'file-error "File is a directory %s" newname))
 
        (if (or (and equal-remote
diff --git a/lisp/net/tramp-rclone.el b/lisp/net/tramp-rclone.el
index e0fd8e3..866e779 100644
--- a/lisp/net/tramp-rclone.el
+++ b/lisp/net/tramp-rclone.el
@@ -215,7 +215,8 @@ file names."
       (with-parsed-tramp-file-name (if t1 filename newname) nil
        (when (and (not ok-if-already-exists) (file-exists-p newname))
          (tramp-error v 'file-already-exists newname))
-       (when (and (file-directory-p newname) (not (directory-name-p newname)))
+       (when (and (file-directory-p newname)
+                  (not (tramp-compat-directory-name-p newname)))
          (tramp-error v 'file-error "File is a directory %s" newname))
 
        (if (or (and t1 (not (tramp-rclone-file-name-p filename)))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 54bf2ba..6e18e73 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1993,7 +1993,8 @@ file names."
       (with-parsed-tramp-file-name (if t1 filename newname) nil
        (when (and (not ok-if-already-exists) (file-exists-p newname))
          (tramp-error v 'file-already-exists newname))
-       (when (and (file-directory-p newname) (not (directory-name-p newname)))
+       (when (and (file-directory-p newname)
+                  (not (tramp-compat-directory-name-p newname)))
          (tramp-error v 'file-error "File is a directory %s" newname))
 
        (with-tramp-progress-reporter
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 594463d..b619e77 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -589,7 +589,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
            (when (and (not ok-if-already-exists) (file-exists-p newname))
              (tramp-error v 'file-already-exists newname))
            (when (and (file-directory-p newname)
-                      (not (directory-name-p newname)))
+                      (not (tramp-compat-directory-name-p newname)))
              (tramp-error v 'file-error "File is a directory %s" newname))
 
            ;; We must also flush the cache of the directory, because
@@ -1334,7 +1334,8 @@ component is used as the target of the symlink."
       (if (tramp-tramp-file-p filename) filename newname) nil
     (when (and (not ok-if-already-exists) (file-exists-p newname))
       (tramp-error v 'file-already-exists newname))
-    (when (and (file-directory-p newname) (not (directory-name-p newname)))
+    (when (and (file-directory-p newname)
+              (not (tramp-compat-directory-name-p newname)))
       (tramp-error v 'file-error "File is a directory %s" newname))
 
     (with-tramp-progress-reporter
diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el
index 0ec98bb..5d5a3f1f 100644
--- a/lisp/net/tramp-sudoedit.el
+++ b/lisp/net/tramp-sudoedit.el
@@ -243,7 +243,8 @@ absolute file names."
       (with-parsed-tramp-file-name (if t1 filename newname) nil
        (when (and (not ok-if-already-exists) (file-exists-p newname))
          (tramp-error v 'file-already-exists newname))
-       (when (and (file-directory-p newname) (not (directory-name-p newname)))
+       (when (and (file-directory-p newname)
+                  (not (tramp-compat-directory-name-p newname)))
          (tramp-error v 'file-error "File is a directory %s" newname))
 
        (if (or (and (file-remote-p filename) (not t1))