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

[Juanma Barranquero]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.319 emacs/lisp/dired.el:1.320
*** emacs/lisp/dired.el:1.319   Mon Jul 18 15:18:33 2005
--- emacs/lisp/dired.el Wed Jul 20 14:08:39 2005
***************
*** 50,62 ****
  
  ;;;###autoload
  (defcustom dired-listing-switches "-al"
!   "*Switches passed to `ls' for dired.  MUST contain the `l' option.
  May contain all other options that don't contradict `-l';
  may contain even `F', `b', `i' and `s'.  See also the variable
  `dired-ls-F-marks-symlinks' concerning the `F' switch.
  On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp,
  some of the `ls' switches are not supported; see the doc string of
! `insert-directory' on ls-lisp.el for more details."
    :type 'string
    :group 'dired)
  
--- 50,62 ----
  
  ;;;###autoload
  (defcustom dired-listing-switches "-al"
!   "*Switches passed to `ls' for Dired.  MUST contain the `l' option.
  May contain all other options that don't contradict `-l';
  may contain even `F', `b', `i' and `s'.  See also the variable
  `dired-ls-F-marks-symlinks' concerning the `F' switch.
  On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp,
  some of the `ls' switches are not supported; see the doc string of
! `insert-directory' on `ls-lisp.el' for more details."
    :type 'string
    :group 'dired)
  
***************
*** 88,94 ****
  
  ;;;###autoload
  (defcustom dired-ls-F-marks-symlinks nil
!   "*Informs dired about how `ls -lF' marks symbolic links.
  Set this to t if `ls' (or whatever program is specified by
  `insert-directory-program') with `-lF' marks the symbolic link
  itself with a trailing @ (usually the case under Ultrix).
--- 88,94 ----
  
  ;;;###autoload
  (defcustom dired-ls-F-marks-symlinks nil
!   "*Informs Dired about how `ls -lF' marks symbolic links.
  Set this to t if `ls' (or whatever program is specified by
  `insert-directory-program') with `-lF' marks the symbolic link
  itself with a trailing @ (usually the case under Ultrix).
***************
*** 153,159 ****
  
  ;;;###autoload
  (defcustom dired-dwim-target nil
!   "*If non-nil, dired tries to guess a default target directory.
  This means: if there is a dired buffer displayed in the next window,
  use its current subdir, instead of the current subdir of this dired buffer.
  
--- 153,159 ----
  
  ;;;###autoload
  (defcustom dired-dwim-target nil
!   "*If non-nil, Dired tries to guess a default target directory.
  This means: if there is a dired buffer displayed in the next window,
  use its current subdir, instead of the current subdir of this dired buffer.
  
***************
*** 176,188 ****
  ;;; Hook variables
  
  (defcustom dired-load-hook nil
!   "Run after loading dired.
  You can customize key bindings or load extensions with this."
    :group 'dired
    :type 'hook)
  
  (defcustom dired-mode-hook nil
!   "Run at the very end of dired-mode."
    :group 'dired
    :type 'hook)
  
--- 176,188 ----
  ;;; Hook variables
  
  (defcustom dired-load-hook nil
!   "Run after loading Dired.
  You can customize key bindings or load extensions with this."
    :group 'dired
    :type 'hook)
  
  (defcustom dired-mode-hook nil
!   "Run at the very end of `dired-mode'."
    :group 'dired
    :type 'hook)
  
***************
*** 229,236 ****
  (defvar dired-del-marker ?D
    "Character used to flag files for deletion.")
  
! (defvar dired-shrink-to-fit
!   t
  ;; I see no reason ever to make this nil -- rms.
  ;;  (> baud-rate search-slow-speed)
    "Non-nil means Dired shrinks the display buffer to fit the marked files.")
--- 229,235 ----
  (defvar dired-del-marker ?D
    "Character used to flag files for deletion.")
  
! (defvar dired-shrink-to-fit t
  ;; I see no reason ever to make this nil -- rms.
  ;;  (> baud-rate search-slow-speed)
    "Non-nil means Dired shrinks the display buffer to fit the marked files.")
***************
*** 241,247 ****
  
  ;;;###autoload
  (defvar dired-directory nil
!   "The directory name or wildcard spec that this Dired directory lists.
  Local to each dired buffer.  May be a list, in which case the car is the
  directory name and the cdr is the list of files to mention.
  The directory name must be absolute, but need not be fully expanded.")
--- 240,246 ----
  
  ;;;###autoload
  (defvar dired-directory nil
!   "The directory name or wildcard spec that this dired directory lists.
  Local to each dired buffer.  May be a list, in which case the car is the
  directory name and the cdr is the list of files to mention.
  The directory name must be absolute, but need not be fully expanded.")
***************
*** 295,301 ****
  Subexpression 2 must end right before the \\n or \\r.")
  
  (defgroup dired-faces nil
!   "Faces used by dired."
    :group 'dired
    :group 'faces)
  
--- 294,300 ----
  Subexpression 2 must end right before the \\n or \\r.")
  
  (defgroup dired-faces nil
!   "Faces used by Dired."
    :group 'dired
    :group 'faces)
  
***************
*** 598,604 ****
  You can move around in it with the usual commands.
  You can flag files for deletion with \\[dired-flag-file-deletion] and then
  delete them by typing \\[dired-do-flagged-delete].
! Type \\[describe-mode] after entering dired for more info.
  
  If DIRNAME is already in a dired buffer, that buffer is used without refresh."
    ;; Cannot use (interactive "D") because of wildcards.
--- 597,603 ----
  You can move around in it with the usual commands.
  You can flag files for deletion with \\[dired-flag-file-deletion] and then
  delete them by typing \\[dired-do-flagged-delete].
! Type \\[describe-mode] after entering Dired for more info.
  
  If DIRNAME is already in a dired buffer, that buffer is used without refresh."
    ;; Cannot use (interactive "D") because of wildcards.
***************
*** 911,917 ****
                    (move-to-column curcol)
                    (when (looking-at
                           (concat
!                           (if (eq (char-before) ?\ ) " *" "[^ ]* *")
                            (if num-align "[0-9][^ ]*")))
                      (- (match-end 0) (match-beginning 0)))))
                 ;; Now, the number of spaces to insert is align-pt-offset
--- 910,916 ----
                    (move-to-column curcol)
                    (when (looking-at
                           (concat
!                           (if (eq (char-before) ?\s) " *" "[^ ]* *")
                            (if num-align "[0-9][^ ]*")))
                      (- (match-end 0) (match-beginning 0)))))
                 ;; Now, the number of spaces to insert is align-pt-offset
***************
*** 1020,1026 ****
  
  (defun dired-revert (&optional arg noconfirm)
    "Reread the dired buffer.
! Must also be called after dired-actual-switches have changed.
  Should not fail even on completely garbaged buffers.
  Preserves old cursor, marks/flags, hidden-p."
    (widen)                             ; just in case user narrowed
--- 1019,1025 ----
  
  (defun dired-revert (&optional arg noconfirm)
    "Reread the dired buffer.
! Must also be called after `dired-actual-switches' have changed.
  Should not fail even on completely garbaged buffers.
  Preserves old cursor, marks/flags, hidden-p."
    (widen)                             ; just in case user narrowed
***************
*** 1500,1511 ****
  Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer.
  Type \\[dired-do-rename] to Rename a file or move the marked files to another 
directory.
  Type \\[dired-do-copy] to Copy files.
! Type \\[dired-sort-toggle-or-edit] to toggle sorting by name/date or change 
the `ls' switches.
! Type \\[revert-buffer] to read all currently expanded directories again.
    This retains all marks and hides subdirs again that were hidden before.
  SPC and DEL can be used to move down and up by lines.
  
! If dired ever gets confused, you can either type \\[revert-buffer] \
  to read the
  directories again, type \\[dired-do-redisplay] \
  to relist a single or the marked files or a
--- 1499,1510 ----
  Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer.
  Type \\[dired-do-rename] to Rename a file or move the marked files to another 
directory.
  Type \\[dired-do-copy] to Copy files.
! Type \\[dired-sort-toggle-or-edit] to toggle Sorting by name/date or change 
the `ls' switches.
! Type \\[revert-buffer] to read all currently expanded directories aGain.
    This retains all marks and hides subdirs again that were hidden before.
  SPC and DEL can be used to move down and up by lines.
  
! If Dired ever gets confused, you can either type \\[revert-buffer] \
  to read the
  directories again, type \\[dired-do-redisplay] \
  to relist a single or the marked files or a
***************
*** 1575,1581 ****
  ;; Idiosyncratic dired commands that don't deal with marks.
  
  (defun dired-summary ()
!   "Summarize basic Dired commands and show recent Dired errors."
    (interactive)
    (dired-why)
    ;>> this should check the key-bindings and use substitute-command-keys if 
non-standard
--- 1574,1580 ----
  ;; Idiosyncratic dired commands that don't deal with marks.
  
  (defun dired-summary ()
!   "Summarize basic Dired commands and show recent dired errors."
    (interactive)
    (dired-why)
    ;>> this should check the key-bindings and use substitute-command-keys if 
non-standard
***************
*** 1590,1596 ****
    (let (buffer-read-only)
      (undo))
    (dired-build-subdir-alist)
!   (message "Change in Dired buffer undone.
  Actual changes in files cannot be undone by Emacs."))
  
  (defun dired-next-line (arg)
--- 1589,1595 ----
    (let (buffer-read-only)
      (undo))
    (dired-build-subdir-alist)
!   (message "Change in dired buffer undone.
  Actual changes in files cannot be undone by Emacs."))
  
  (defun dired-next-line (arg)
***************
*** 1654,1660 ****
        file-name
        (if (file-symlink-p file-name)
          (error "File is a symlink to a nonexistent target")
!       (error "File no longer exists; type `g' to update Dired buffer")))))
  
  ;; Force `f' rather than `e' in the mode doc:
  (defalias 'dired-advertised-find-file 'dired-find-file)
--- 1653,1659 ----
        file-name
        (if (file-symlink-p file-name)
          (error "File is a symlink to a nonexistent target")
!       (error "File no longer exists; type `g' to update dired buffer")))))
  
  ;; Force `f' rather than `e' in the mode doc:
  (defalias 'dired-advertised-find-file 'dired-find-file)
***************
*** 1696,1702 ****
        (find-file-other-window (file-name-sans-versions file t)))))
  
  (defun dired-view-file ()
!   "In Dired, examine a file in view mode, returning to dired when done.
  When file is a directory, show it in this buffer if it is inserted.
  Otherwise, display it in another buffer."
    (interactive)
--- 1695,1701 ----
        (find-file-other-window (file-name-sans-versions file t)))))
  
  (defun dired-view-file ()
!   "In Dired, examine a file in view mode, returning to Dired when done.
  When file is a directory, show it in this buffer if it is inserted.
  Otherwise, display it in another buffer."
    (interactive)
***************
*** 1976,1982 ****
    "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;
--- 1975,1981 ----
    "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;
***************
*** 2361,2367 ****
  (defun dired-delete-file (file &optional recursive) "\
  Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
  RECURSIVE determines what to do with a non-empty directory.  If RECURSIVE is:
! Nil, do not delete.
  `always', delete recursively without asking.
  `top', ask for each directory at top level.
  Anything else, ask for each sub-directory."
--- 2360,2366 ----
  (defun dired-delete-file (file &optional recursive) "\
  Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
  RECURSIVE determines what to do with a non-empty directory.  If RECURSIVE is:
! nil, do not delete.
  `always', delete recursively without asking.
  `top', ask for each directory at top level.
  Anything else, ask for each sub-directory."
***************
*** 2554,2560 ****
        )))
  
  (defvar dired-no-confirm nil
!   "A list of symbols for commands dired should not confirm.
  Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
  `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink',
  `touch' and `uncompress'.")
--- 2553,2559 ----
        )))
  
  (defvar dired-no-confirm nil
!   "A list of symbols for commands Dired should not confirm.
  Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
  `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink',
  `touch' and `uncompress'.")
***************
*** 2891,2897 ****
    "Flag all backup files (names ending with `~') for deletion.
  With prefix argument, unflag these files."
    (interactive "P")
!   (let ((dired-marker-char (if unflag-p ?\  dired-del-marker)))
      (dired-mark-if
       ;; Don't call backup-file-name-p unless the last character looks like
       ;; it might be the end of a backup file name.  This isn't very general,
--- 2890,2896 ----
    "Flag all backup files (names ending with `~') for deletion.
  With prefix argument, unflag these files."
    (interactive "P")
!   (let ((dired-marker-char (if unflag-p ?\s dired-del-marker)))
      (dired-mark-if
       ;; Don't call backup-file-name-p unless the last character looks like
       ;; it might be the end of a backup file name.  This isn't very general,
***************
*** 2925,2931 ****
        (save-excursion
        (goto-char (point-min))
        (while (search-forward string nil t)
!         (if (if (= old ?\ )
                  (save-match-data
                    (dired-get-filename 'no-dir t))
                t)
--- 2924,2930 ----
        (save-excursion
        (goto-char (point-min))
        (while (search-forward string nil t)
!         (if (if (= old ?\s)
                  (save-match-data
                    (dired-get-filename 'no-dir t))
                t)
***************
*** 2933,2939 ****
                                    (match-end 0) old new)))))))
  
  (defun dired-unmark-all-marks ()
!   "Remove all marks from all files in the Dired buffer."
    (interactive)
    (dired-unmark-all-files ?\r))
  
--- 2932,2938 ----
                                    (match-end 0) old new)))))))
  
  (defun dired-unmark-all-marks ()
!   "Remove all marks from all files in the dired buffer."
    (interactive)
    (dired-unmark-all-files ?\r))
  
***************
*** 2961,2967 ****
                       (dired-query 'query "Unmark file `%s'? "
                                    file))))
            (progn (subst-char-in-region (1- (point)) (point)
!                                        (preceding-char) ?\ )
                   (setq count (1+ count)))))
        (message (if (= count 1) "1 mark removed"
                 "%d marks removed")
--- 2960,2966 ----
                       (dired-query 'query "Unmark file `%s'? "
                                    file))))
            (progn (subst-char-in-region (1- (point)) (point)
!                                        (preceding-char) ?\s)
                   (setq count (1+ count)))))
        (message (if (= count 1) "1 mark removed"
                 "%d marks removed")
***************
*** 3048,3062 ****
  (defvar dired-sort-by-date-regexp
    (concat "^-[^" dired-ls-sorting-switches
          "]*t[^" dired-ls-sorting-switches "]*$")
!   "Regexp recognized by dired to set `by date' mode.")
  
  (defvar dired-sort-by-name-regexp
    (concat "^-[^t" dired-ls-sorting-switches "]+$")
!   "Regexp recognized by dired to set `by name' mode.")
  
  (defvar dired-sort-inhibit nil
    "Non-nil means the Dired sort command is disabled.
! The idea is to set this buffer-locally in special Dired buffers.")
  
  (defun dired-sort-set-modeline ()
    ;; Set modeline display according to dired-actual-switches.
--- 3047,3061 ----
  (defvar dired-sort-by-date-regexp
    (concat "^-[^" dired-ls-sorting-switches
          "]*t[^" dired-ls-sorting-switches "]*$")
!   "Regexp recognized by Dired to set `by date' mode.")
  
  (defvar dired-sort-by-name-regexp
    (concat "^-[^t" dired-ls-sorting-switches "]+$")
!   "Regexp recognized by Dired to set `by name' mode.")
  
  (defvar dired-sort-inhibit nil
    "Non-nil means the Dired sort command is disabled.
! The idea is to set this buffer-locally in special dired buffers.")
  
  (defun dired-sort-set-modeline ()
    ;; Set modeline display according to dired-actual-switches.
***************
*** 3078,3084 ****
  With a prefix argument you can edit the current listing switches instead."
    (interactive "P")
    (when dired-sort-inhibit
!     (error "Cannot sort this Dired buffer"))
    (if arg
        (dired-sort-other
         (read-string "ls switches (must contain -l): " dired-actual-switches))
--- 3077,3083 ----
  With a prefix argument you can edit the current listing switches instead."
    (interactive "P")
    (when dired-sort-inhibit
!     (error "Cannot sort this dired buffer"))
    (if arg
        (dired-sort-other
         (read-string "ls switches (must contain -l): " dired-actual-switches))
***************
*** 3121,3127 ****
      (concat result (substring string start))))
  
  (defun dired-sort-other (switches &optional no-revert)
!   "Specify new ls SWITCHES for current dired buffer.
  Values matching `dired-sort-by-date-regexp' or `dired-sort-by-name-regexp'
  set the minor mode accordingly, others appear literally in the mode line.
  With optional second arg NO-REVERT, don't refresh the listing afterwards."
--- 3120,3126 ----
      (concat result (substring string start))))
  
  (defun dired-sort-other (switches &optional no-revert)
!   "Specify new `ls' SWITCHES for current dired buffer.
  Values matching `dired-sort-by-date-regexp' or `dired-sort-by-name-regexp'
  set the minor mode accordingly, others appear literally in the mode line.
  With optional second arg NO-REVERT, don't refresh the listing afterwards."