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

[Richard M. Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.549 emacs/lisp/files.el:1.550
*** emacs/lisp/files.el:1.549   Thu Jan 24 13:55:53 2002
--- emacs/lisp/files.el Wed Feb  6 10:29:29 2002
***************
*** 3822,3838 ****
        ;; Get a list of the indices of the args which are file names.
        (file-arg-indices
         (cdr (or (assq operation
!                       ;; The first four are special because they
                        ;; return a file name.  We want to include the /:
                        ;; in the return value.
                        ;; So just avoid stripping it in the first place.
                        '((expand-file-name . nil)
-                         ;; `identity' means just return the first arg
-                         ;; as stripped of its quoting.
-                         (substitute-in-file-name . identity)
                          (file-name-directory . nil)
                          (file-name-as-directory . nil)
                          (directory-file-name . nil)
                          (file-name-completion 0 1)
                          (file-name-all-completions 0 1)
                          (rename-file 0 1)
--- 3822,3839 ----
        ;; Get a list of the indices of the args which are file names.
        (file-arg-indices
         (cdr (or (assq operation
!                       ;; The first five are special because they
                        ;; return a file name.  We want to include the /:
                        ;; in the return value.
                        ;; So just avoid stripping it in the first place.
                        '((expand-file-name . nil)
                          (file-name-directory . nil)
                          (file-name-as-directory . nil)
                          (directory-file-name . nil)
+                         (file-name-sans-versions . nil)
+                         ;; `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)
***************
*** 3857,3863 ****
        (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)
--- 3858,3869 ----
        (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 (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)