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

[Luc Teirlinck]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.305 emacs/lisp/dired.el:1.306
*** emacs/lisp/dired.el:1.305   Mon Mar 28 01:05:52 2005
--- emacs/lisp/dired.el Mon Apr  4 23:58:11 2005
***************
*** 1937,1946 ****
    "Copy names of marked (or next ARG) files into the kill ring.
  The names are separated by a space.
  With a zero prefix arg, use the absolute file name of each marked file.
! With \\[universal-argument], use the file name sans directory of each marked 
file.
  
! If on a subdir headerline, use subdirname instead; prefix arg is ignored
! in this case.
  
  You can then feed the file name(s) to other commands with \\[yank]."
    (interactive "P")
--- 1937,1947 ----
    "Copy names of marked (or next ARG) files into the kill ring.
  The names are separated by a space.
  With a zero prefix arg, use the absolute file name of each marked file.
! With \\[universal-argument], use the file name relative to the Dired buffer's
! `default-directory'.  (This still may contain slashes if in a subdirectory.)
  
! If on a subdir headerline, use absolute subdirname instead;
! prefix arg and marked files are ignored in this case.
  
  You can then feed the file name(s) to other commands with \\[yank]."
    (interactive "P")
***************
*** 1950,1959 ****
                          (if arg
                              (cond ((zerop (prefix-numeric-value arg))
                                     (dired-get-marked-files))
!                                   ((integerp arg)
!                                    (dired-get-marked-files 'no-dir arg))
!                                   (t    ; else a raw arg
!                                    (dired-get-marked-files t)))
                            (dired-get-marked-files 'no-dir))
                          " "))))
      (if (eq last-command 'kill-region)
--- 1951,1961 ----
                          (if arg
                              (cond ((zerop (prefix-numeric-value arg))
                                     (dired-get-marked-files))
!                                   ((consp arg)
!                                    (dired-get-marked-files t))
!                                   (t
!                                    (dired-get-marked-files
!                                   'no-dir (prefix-numeric-value arg))))
                            (dired-get-marked-files 'no-dir))
                          " "))))
      (if (eq last-command 'kill-region)