changeset 44703:a70fdb3fd13c

(file-name-non-special): Don't mangle the 0'th arg and the return value of file-name-completion and file-name-all-completions.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 19 Apr 2002 16:26:53 +0000
parents 8c00cd35d3d7
children 9facddb16376
files lisp/files.el
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/files.el	Fri Apr 19 13:46:02 2002 +0000
+++ b/lisp/files.el	Fri Apr 19 16:26:53 2002 +0000
@@ -3917,8 +3917,8 @@
 			  ;; `identity' means just return the first arg
 			  ;; as stripped of its quoting.
 			  (substitute-in-file-name . identity)
-			  (file-name-completion 0 1)
-			  (file-name-all-completions 0 1)
+			  (file-name-completion 1)
+			  (file-name-all-completions 1)
 			  (rename-file 0 1)
 			  (copy-file 0 1)
 			  (make-symbolic-link 0 1)
@@ -3941,12 +3941,7 @@
 	(setq file-arg-indices (cdr file-arg-indices))))
     (if (eq file-arg-indices 'identity)
 	(car arguments)
-      (let ((value (apply operation arguments)))
-	(cond ((memq operation '(file-name-completion))
-	       (and value (if (eq value t) t (concat "/:" value))))
-	      ((memq operation '(file-name-all-completions))
-	       (mapcar (lambda (name) (concat "/:" name)) value))
-	      (t value))))))
+      (apply operation arguments))))
 
 (define-key ctl-x-map "\C-f" 'find-file)
 (define-key ctl-x-map "\C-r" 'find-file-read-only)