[Emacs-diffs] Changes to emacs/lisp/files.el

[Stefan Monnier]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.564 emacs/lisp/files.el:1.565
*** emacs/lisp/files.el:1.564   Thu Apr 11 08:13:53 2002
--- emacs/lisp/files.el Fri Apr 19 12:26:53 2002
***************
*** 3917,3924 ****
                          ;; `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)
                          (rename-file 0 1)
                          (copy-file 0 1)
                          (make-symbolic-link 0 1)
--- 3917,3924 ----
                          ;; `identity' means just return the first arg
                          ;; as stripped of its quoting.
                          (substitute-in-file-name . identity)
!                         (file-name-completion 1)
!                         (file-name-all-completions 1)
                          (rename-file 0 1)
                          (copy-file 0 1)
                          (make-symbolic-link 0 1)
***************
*** 3941,3952 ****
        (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))))))
  
  (define-key ctl-x-map "\C-f" 'find-file)
  (define-key ctl-x-map "\C-r" 'find-file-read-only)
--- 3941,3947 ----
        (setq file-arg-indices (cdr file-arg-indices))))
      (if (eq file-arg-indices 'identity)
        (car arguments)
!       (apply operation arguments))))
  
  (define-key ctl-x-map "\C-f" 'find-file)
  (define-key ctl-x-map "\C-r" 'find-file-read-only)