Prefer file-name-quote to concat "/:"

Suggested by Michael Albinus (Bug#28264#13).
* lisp/files.el (files--splice-dirname-file): Use file-name-quote
rather than attempting to do it by hand.

diff --git a/lisp/files.el b/lisp/files.el
index 5f55aa75a70a36e4cd13286894e941a6c12bf8dc..7754be2964340082537732fda360bf2c386a7414 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1156,16 +1156,16 @@ names beginning with `~'."
 (defun files--splice-dirname-file (dirname file)
   "Splice DIRNAME to FILE like the operating system would.
 If FILENAME is relative, return DIRNAME concatenated to FILE.
-Otherwise return FILE, quoted with `/:' if DIRNAME and FILE have
+Otherwise return FILE, quoted as needed if DIRNAME and FILE have
 different handlers; although this quoting is dubious if DIRNAME
-is remote, it is not clear what would be better.  This function
+is magic, it is not clear what would be better.  This function
 differs from `expand-file-name' in that DIRNAME must be a
 directory name and leading `~' and `/:' are not special in FILE."
   (if (files--name-absolute-system-p file)
       (if (eq (find-file-name-handler dirname 'file-symlink-p)
              (find-file-name-handler file 'file-symlink-p))
          file
-       (concat "/:" file))
+       (file-name-quote file))
     (concat dirname file)))
 
 (defun file-truename (filename &optional counter prev-dirs)