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

[Kim F. Storm]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.251 emacs/lisp/dired.el:1.252
*** emacs/lisp/dired.el:1.251   Fri Jan 10 11:42:27 2003
--- emacs/lisp/dired.el Tue Jan 14 18:10:14 2003
***************
*** 1,6 ****
  ;;; dired.el --- directory-browsing commands
  
! ;; Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 1997, 2000, 2001
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Sebastian Kremer <address@hidden>
--- 1,6 ----
  ;;; dired.el --- directory-browsing commands
  
! ;; Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 1997, 2000, 2001, 2003
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Sebastian Kremer <address@hidden>
***************
*** 59,65 ****
    :type 'string
    :group 'dired)
  
! ; Don't use absolute paths as /bin should be in any PATH and people
  ; may prefer /usr/local/gnu/bin or whatever.  However, chown is
  ; usually not in PATH.
  
--- 59,65 ----
    :type 'string
    :group 'dired)
  
! ; Don't use absolute file names as /bin should be in any PATH and people
  ; may prefer /usr/local/gnu/bin or whatever.  However, chown is
  ; usually not in PATH.
  
***************
*** 1517,1523 ****
        (replace-match newtext t literal string))))
  
  (defun dired-make-absolute (file &optional dir)
!   ;;"Convert FILE (a pathname relative to DIR) to an absolute pathname."
    ;; We can't always use expand-file-name as this would get rid of `.'
    ;; or expand in / instead default-directory if DIR=="".
    ;; This should be good enough for ange-ftp, but might easily be
--- 1517,1523 ----
        (replace-match newtext t literal string))))
  
  (defun dired-make-absolute (file &optional dir)
!   ;;"Convert FILE (a file name relative to DIR) to an absolute file name."
    ;; We can't always use expand-file-name as this would get rid of `.'
    ;; or expand in / instead default-directory if DIR=="".
    ;; This should be good enough for ange-ftp, but might easily be
***************
*** 1679,1686 ****
  (defun dired-copy-filename-as-kill (&optional arg)
    "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 complete pathname of each marked file.
! With \\[universal-argument], use the relative pathname of each marked file.
  
  If on a subdir headerline, use subdirname instead; prefix arg is ignored
  in this case.
--- 1679,1686 ----
  (defun dired-copy-filename-as-kill (&optional arg)
    "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.
***************
*** 1799,1806 ****
      (string-match (concat "^" (regexp-quote dir)) file)))
  
  (defun dired-normalize-subdir (dir)
!   ;; Prepend default-directory to DIR if relative path name.
!   ;; dired-get-filename must be able to make a valid filename from a
    ;; file and its directory DIR.
    (file-name-as-directory
     (if (file-name-absolute-p dir)
--- 1799,1806 ----
      (string-match (concat "^" (regexp-quote dir)) file)))
  
  (defun dired-normalize-subdir (dir)
!   ;; Prepend default-directory to DIR if relative file name.
!   ;; dired-get-filename must be able to make a valid file name from a
    ;; file and its directory DIR.
    (file-name-as-directory
     (if (file-name-absolute-p dir)
***************
*** 1944,1950 ****
  (defun dired-goto-file (file)
    "Go to file line of FILE in this dired buffer."
    ;; Return value of point on success, else nil.
!   ;; FILE must be an absolute pathname.
    ;; Loses if FILE contains control chars like "\007" for which ls
    ;; either inserts "?" or "\\007" into the buffer, so we won't find
    ;; it in the buffer.
--- 1944,1950 ----
  (defun dired-goto-file (file)
    "Go to file line of FILE in this dired buffer."
    ;; Return value of point on success, else nil.
!   ;; FILE must be an absolute file name.
    ;; Loses if FILE contains control chars like "\007" for which ls
    ;; either inserts "?" or "\\007" into the buffer, so we won't find
    ;; it in the buffer.
***************
*** 2992,3000 ****
    what to do with it.  For directions, type \\[help-command] at that time.
  NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'.
  REGEXP defaults to the last regexp used.
! With a zero prefix arg, renaming by regexp affects the complete
!   pathname - usually only the non-directory part of file names is used
!   and changed."
    t)
  
  (autoload 'dired-do-copy-regexp "dired-aux"
--- 2992,2999 ----
    what to do with it.  For directions, type \\[help-command] at that time.
  NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'.
  REGEXP defaults to the last regexp used.
! With a zero prefix arg, renaming by regexp affects the full file name;
! usually only the non-directory part of file names is used and changed."
    t)
  
  (autoload 'dired-do-copy-regexp "dired-aux"