diff options
| author | Stefan Monnier <[email protected]> | 2002-04-19 16:27:09 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2002-04-19 16:27:09 +0000 |
| commit | c37adaa5eaf360904ee4f32d01fa998c496d28a6 (patch) | |
| tree | c6b1747b057f9321169fbe16c6aff3812e1879f1 /lisp/files.el | |
| parent | 58b1103e0e47d26596ed518fa8a61c2bf5e6edb5 (diff) | |
(file-name-non-special): Don't mangle the 0'th arg and the
return value of file-name-completion and file-name-all-completions.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/files.el b/lisp/files.el index c4e3e8c376..1c97aaac71 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3917,8 +3917,8 @@ With prefix arg, silently save all file-visiting buffers, then kill." ;; `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 @@ With prefix arg, silently save all file-visiting buffers, then kill." (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) |