Revert a1bbc49015 (Bug#30243), do not merge

* lisp/files.el:
* test/lisp/net/tramp-tests.el: Revert a1bbc49015.  (Bug#30243)

1 files changed, 17 insertions, 21 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 49d506bdd9e..996a31d375f 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1882,9 +1882,9 @@ This checks also `file-name-as-directory', `file-name-directory',
   "Check `copy-file'."
   (skip-unless (tramp--test-enabled))
 
-  ;; `filename-non-special' has been fixed in Emacs 26.1, see Bug#29579.
-  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs26-p))
-                      '(nil t) '(nil)))
+  ;; TODO: The quoted case does not work.  Copy local file to remote.
+  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
+  (let (quoted)
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
           (tmp-name2 (tramp--test-make-temp-name nil quoted))
           (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -1984,9 +1984,9 @@ This checks also `file-name-as-directory', `file-name-directory',
   "Check `rename-file'."
   (skip-unless (tramp--test-enabled))
 
-  ;; `filename-non-special' has been fixed in Emacs 26.1, see Bug#29579.
-  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs26-p))
-                      '(nil t) '(nil)))
+  ;; TODO: The quoted case does not work.
+  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
+  (let (quoted)
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
           (tmp-name2 (tramp--test-make-temp-name nil quoted))
           (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -2810,11 +2810,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             ;; Symbolic links could look like a remote file name.
             ;; They must be quoted then.
             (delete-file tmp-name2)
-            (make-symbolic-link
-             (funcall
-              (if quoted 'tramp-compat-file-name-unquote 'identity)
-              "/penguin:motd:")
-             tmp-name2)
+            (make-symbolic-link "/penguin:motd:" tmp-name2)
             (should (file-symlink-p tmp-name2))
             (should
              (string-equal
@@ -2829,7 +2825,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             ;; We must unquote it.
             (should
              (string-equal
-              (tramp-compat-file-name-unquote (file-truename tmp-name1))
+              (file-truename tmp-name1)
               (tramp-compat-file-name-unquote (file-truename tmp-name3)))))
 
         ;; Cleanup.
@@ -2955,9 +2951,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
   (skip-unless (tramp--test-enabled))
   (skip-unless (file-acl tramp-test-temporary-file-directory))
 
-  ;; `filename-non-special' has been fixed in Emacs 26.1, see Bug#29579.
-  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs26-p))
-                      '(nil t) '(nil)))
+  ;; TODO: The quoted case does not work.  Copy local file to remote.
+  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
+  (let (quoted)
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
           (tmp-name2 (tramp--test-make-temp-name nil quoted))
           (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -3033,9 +3029,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
    (not (equal (file-selinux-context tramp-test-temporary-file-directory)
                '(nil nil nil nil))))
 
-  ;; `filename-non-special' has been fixed in Emacs 26.1, see Bug#29579.
-  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs26-p))
-                      '(nil t) '(nil)))
+  ;; TODO: The quoted case does not work.  Copy local file to remote.
+  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
+  (let (quoted)
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
           (tmp-name2 (tramp--test-make-temp-name nil quoted))
           (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -4086,9 +4082,9 @@ This requires restrictions of file name syntax."
 
 (defun tramp--test-check-files (&rest files)
   "Run a simple but comprehensive test over every file in FILES."
-  ;; `filename-non-special' has been fixed in Emacs 26.1, see Bug#29579.
-  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs26-p))
-                      '(nil t) '(nil)))
+  ;; TODO: The quoted case does not work.
+  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
+  (let (quoted)
     ;; We must use `file-truename' for the temporary directory,
     ;; because it could be located on a symlinked directory.  This
     ;; would let the test fail.