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

[Juanma Barranquero]

Index: emacs/lisp/dired-x.el
diff -c emacs/lisp/dired-x.el:1.60 emacs/lisp/dired-x.el:1.61
*** emacs/lisp/dired-x.el:1.60  Mon Jul 18 15:21:16 2005
--- emacs/lisp/dired-x.el       Wed Jul 20 14:54:27 2005
***************
*** 157,163 ****
  (define-minor-mode dired-omit-mode
    "Toggle Dired-Omit mode.
  With numeric ARG, enable Dired-Omit mode if ARG is positive, disable
! otherwise. Enabling and disabling is buffer-local.
  If enabled, \"uninteresting\" files are not listed.
  Uninteresting files are those whose filenames match regexp `dired-omit-files',
  plus those ending with extensions in `dired-omit-extensions'."
--- 157,163 ----
  (define-minor-mode dired-omit-mode
    "Toggle Dired-Omit mode.
  With numeric ARG, enable Dired-Omit mode if ARG is positive, disable
! otherwise.  Enabling and disabling is buffer-local.
  If enabled, \"uninteresting\" files are not listed.
  Uninteresting files are those whose filenames match regexp `dired-omit-files',
  plus those ending with extensions in `dired-omit-extensions'."
***************
*** 185,191 ****
  If nil, Dired finds the directory as a subdirectory in some other buffer
  if it is present as one.
  
! If there are several Dired buffers for a directory, the most recently
  used is chosen.
  
  Dired avoids switching to the current buffer, so that if you have
--- 185,191 ----
  If nil, Dired finds the directory as a subdirectory in some other buffer
  if it is present as one.
  
! If there are several dired buffers for a directory, the most recently
  used is chosen.
  
  Dired avoids switching to the current buffer, so that if you have
***************
*** 201,207 ****
    :group 'dired-x)
  
  (defcustom dired-enable-local-variables t
!   "*Control use of local-variables lists in dired.
  The value can be t, nil or something else.
  A value of t means local-variables lists are obeyed;
  nil means they are ignored; anything else means query.
--- 201,207 ----
    :group 'dired-x)
  
  (defcustom dired-enable-local-variables t
!   "*Control use of local-variables lists in Dired.
  The value can be t, nil or something else.
  A value of t means local-variables lists are obeyed;
  nil means they are ignored; anything else means query.
***************
*** 232,238 ****
    :group 'dired-x)
  
  (defcustom dired-clean-up-buffers-too t
!   "*Non-nil means offer to kill buffers visiting files and dirs deleted in 
dired."
    :type 'boolean
    :group 'dired-x)
  
--- 232,238 ----
    :group 'dired-x)
  
  (defcustom dired-clean-up-buffers-too t
!   "*Non-nil means offer to kill buffers visiting files and dirs deleted in 
Dired."
    :type 'boolean
    :group 'dired-x)
  
***************
*** 271,277 ****
  (add-hook 'dired-after-readin-hook 'dired-omit-expunge)
  
  (defun dired-extra-startup ()
!   "Automatically put on `dired-mode-hook' to get extra dired features:
  \\<dired-mode-map>
    \\[dired-do-run-mail]\t-- run mail on folder (see `dired-bind-vm')
    \\[dired-info]\t-- run info on file
--- 271,277 ----
  (add-hook 'dired-after-readin-hook 'dired-omit-expunge)
  
  (defun dired-extra-startup ()
!   "Automatically put on `dired-mode-hook' to get extra Dired features:
  \\<dired-mode-map>
    \\[dired-do-run-mail]\t-- run mail on folder (see `dired-bind-vm')
    \\[dired-info]\t-- run info on file
***************
*** 279,286 ****
    \\[dired-do-find-marked-files]\t-- visit all marked files simultaneously
    \\[dired-omit-mode]\t-- toggle omitting of files
    \\[dired-mark-sexp]\t-- mark by Lisp expression
!   \\[dired-copy-filename-as-kill]\t-- copy the file or subdir names into the 
kill ring.
!   \t   You can feed it to other commands using \\[yank].
  
  For more features, see variables
  
--- 279,286 ----
    \\[dired-do-find-marked-files]\t-- visit all marked files simultaneously
    \\[dired-omit-mode]\t-- toggle omitting of files
    \\[dired-mark-sexp]\t-- mark by Lisp expression
!   \\[dired-copy-filename-as-kill]\t-- copy the file or subdir names into the 
kill ring;
!   \t   you can feed it to other commands using \\[yank]
  
  For more features, see variables
  
***************
*** 357,363 ****
  ;;; Mark files with some extension.
  (defun dired-mark-extension (extension &optional marker-char)
    "Mark all files with a certain EXTENSION for use in later commands.
! A `.' is not automatically prepended to the string entered."
    ;; EXTENSION may also be a list of extensions instead of a single one.
    ;; Optional MARKER-CHAR is marker to use.
    (interactive "sMarking extension: \nP")
--- 357,363 ----
  ;;; Mark files with some extension.
  (defun dired-mark-extension (extension &optional marker-char)
    "Mark all files with a certain EXTENSION for use in later commands.
! A `.' is *not* automatically prepended to the string entered."
    ;; EXTENSION may also be a list of extensions instead of a single one.
    ;; Optional MARKER-CHAR is marker to use.
    (interactive "sMarking extension: \nP")
***************
*** 434,440 ****
  (defun dired-jump (&optional other-window)
    "Jump to dired buffer corresponding to current buffer.
  If in a file, dired the current directory and move to file's line.
! If in dired already, pop up a level and goto old directory's line.
  In case the proper dired file line cannot be found, refresh the dired
  buffer and try again."
    (interactive "P")
--- 434,440 ----
  (defun dired-jump (&optional other-window)
    "Jump to dired buffer corresponding to current buffer.
  If in a file, dired the current directory and move to file's line.
! If in Dired already, pop up a level and goto old directory's line.
  In case the proper dired file line cannot be found, refresh the dired
  buffer and try again."
    (interactive "P")
***************
*** 465,471 ****
                    (dired-goto-file file))))))))
  
  (defun dired-jump-other-window ()
!   "Like \\[dired-jump] (dired-jump) but in other window."
    (interactive)
    (dired-jump t))
  
--- 465,471 ----
                    (dired-goto-file file))))))))
  
  (defun dired-jump-other-window ()
!   "Like \\[dired-jump] (`dired-jump') but in other window."
    (interactive)
    (dired-jump t))
  
***************
*** 478,484 ****
  ;; sk 28-Aug-1991 09:37
  (defvar dired-omit-localp 'no-dir
    "The LOCALP argument `dired-omit-expunge' passes to `dired-get-filename'.
! If it is 'no-dir, omitting is much faster, but you can only match
  against the non-directory part of the file name.  Set it to nil if you
  need to match the entire file name.")
  
--- 478,484 ----
  ;; sk 28-Aug-1991 09:37
  (defvar dired-omit-localp 'no-dir
    "The LOCALP argument `dired-omit-expunge' passes to `dired-get-filename'.
! If it is `no-dir', omitting is much faster, but you can only match
  against the non-directory part of the file name.  Set it to nil if you
  need to match the entire file name.")
  
***************
*** 569,577 ****
  REGEXP is matched against the entire file name.
  Does not re-mark files which already have a mark.
  With prefix argument, unflag all those files.
! Second optional argument LOCALP is as in `dired-get-filename'."
    (interactive "P")
!   (let ((dired-marker-char (if unflag-p ?\  dired-marker-char)))
      (dired-mark-if
       (and
        ;; not already marked
--- 569,577 ----
  REGEXP is matched against the entire file name.
  Does not re-mark files which already have a mark.
  With prefix argument, unflag all those files.
! Optional fourth argument LOCALP is as in `dired-get-filename'."
    (interactive "P")
!   (let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
      (dired-mark-if
       (and
        ;; not already marked
***************
*** 621,627 ****
  
  ;;; For browsing `ls -lR' listings in a dired-like fashion.
  
! (fset 'virtual-dired 'dired-virtual)
  (defun dired-virtual (dirname &optional switches)
    "Put this buffer into Virtual Dired mode.
  
--- 621,627 ----
  
  ;;; For browsing `ls -lR' listings in a dired-like fashion.
  
! (defalias 'virtual-dired 'dired-virtual)
  (defun dired-virtual (dirname &optional switches)
    "Put this buffer into Virtual Dired mode.
  
***************
*** 638,647 ****
  If you have save a Dired buffer in a file you can use \\[dired-virtual] to
  resume it in a later session.
  
! Type \\<dired-mode-map>\\[revert-buffer] in the
! Virtual Dired buffer and answer `y' to convert the virtual to a real
! dired buffer again.  You don't have to do this, though: you can relist
! single subdirs using \\[dired-do-redisplay]."
  
    ;; DIRNAME is the top level directory of the buffer.  It will become
    ;; its `default-directory'.  If nil, the old value of
--- 638,647 ----
  If you have save a Dired buffer in a file you can use \\[dired-virtual] to
  resume it in a later session.
  
! Type \\<dired-mode-map>\\[revert-buffer] \
! in the Virtual Dired buffer and answer `y' to convert
! the virtual to a real dired buffer again.  You don't have to do this, though:
! you can relist single subdirs using \\[dired-do-redisplay]."
  
    ;; DIRNAME is the top level directory of the buffer.  It will become
    ;; its `default-directory'.  If nil, the old value of
***************
*** 725,736 ****
  ;; `buffer-contents-mode-alist'.
  ;; Or you use infer-mode.el and infer-mode-alist, same syntax.
  (defun dired-virtual-mode ()
!   "Put current buffer into virtual dired mode (see `dired-virtual').
  Useful on `buffer-contents-mode-alist' (which see) with the regexp
  
      \"^  \\(/[^ /]+\\)/?+:$\"
  
! to put saved dired buffers automatically into virtual dired mode.
  
  Also useful for `auto-mode-alist' (which see) like this:
  
--- 725,736 ----
  ;; `buffer-contents-mode-alist'.
  ;; Or you use infer-mode.el and infer-mode-alist, same syntax.
  (defun dired-virtual-mode ()
!   "Put current buffer into Virtual Dired mode (see `dired-virtual').
  Useful on `buffer-contents-mode-alist' (which see) with the regexp
  
      \"^  \\(/[^ /]+\\)/?+:$\"
  
! to put saved dired buffers automatically into Virtual Dired mode.
  
  Also useful for `auto-mode-alist' (which see) like this:
  
***************
*** 768,774 ****
        default-directory))
  
  (defun dired-smart-shell-command (cmd &optional insert)
!   "Like function `shell-command', but in the current Tree Dired directory."
    (interactive (list (read-from-minibuffer "Shell command: "
                                           nil nil nil 'shell-command-history)
                     current-prefix-arg))
--- 768,774 ----
        default-directory))
  
  (defun dired-smart-shell-command (cmd &optional insert)
!   "Like function `shell-command', but in the current Virtual Dired directory."
    (interactive (list (read-from-minibuffer "Shell command: "
                                           nil nil nil 'shell-command-history)
                     current-prefix-arg))
***************
*** 800,807 ****
  (defvar dired-local-variables-file (convert-standard-filename ".dired")
    "Filename, as string, containing local dired buffer variables to be hacked.
  If this file found in current directory, then it will be inserted into dired
! buffer and `hack-local-variables' will be run.  See Emacs Info pages for more
! information on local variables.  See also `dired-enable-local-variables'.")
  
  (defun dired-hack-local-variables ()
    "Evaluate local variables in `dired-local-variables-file' for dired buffer."
--- 800,808 ----
  (defvar dired-local-variables-file (convert-standard-filename ".dired")
    "Filename, as string, containing local dired buffer variables to be hacked.
  If this file found in current directory, then it will be inserted into dired
! buffer and `hack-local-variables' will be run.  See Info node
! `(emacs)File Variables' for more information on local variables.
! See also `dired-enable-local-variables'.")
  
  (defun dired-hack-local-variables ()
    "Evaluate local variables in `dired-local-variables-file' for dired buffer."
***************
*** 828,834 ****
  
  (defun dired-omit-here-always ()
    "Create `dired-local-variables-file' for omitting and reverts directory.
! Sets dired-omit-file-p to t in a local variables file that is readable by
  dired."
    (interactive)
    (if (file-exists-p dired-local-variables-file)
--- 829,835 ----
  
  (defun dired-omit-here-always ()
    "Create `dired-local-variables-file' for omitting and reverts directory.
! Sets `dired-omit-mode' to t in a local variables file that is readable by
  dired."
    (interactive)
    (if (file-exists-p dired-local-variables-file)
***************
*** 1024,1030 ****
  
      \(REGEXP COMMAND...\)
  
! where each COMMAND can either be a string or a lisp expression that evaluates
  to a string.  If several COMMANDs are given, the first one will be the default
  and the rest will be added temporarily to the history and can be retrieved
  with \\[previous-history-element] (M-p) .
--- 1025,1031 ----
  
      \(REGEXP COMMAND...\)
  
! where each COMMAND can either be a string or a Lisp expression that evaluates
  to a string.  If several COMMANDs are given, the first one will be the default
  and the rest will be added temporarily to the history and can be retrieved
  with \\[previous-history-element] (M-p) .
***************
*** 1321,1327 ****
  
  (defun dired-man ()
    "Run man on this file.  Display old buffer if buffer name matches filename.
! Uses ../lisp/man.el of \\[manual-entry] fame."
    (interactive)
    (require 'man)
    (let* ((file (dired-get-filename))
--- 1322,1328 ----
  
  (defun dired-man ()
    "Run man on this file.  Display old buffer if buffer name matches filename.
! Uses `man.el' of \\[manual-entry] fame."
    (interactive)
    (require 'man)
    (let* ((file (dired-get-filename))
***************
*** 1441,1447 ****
  (defun dired-initial-position (dirname)
    "Where point should go in a new listing of DIRNAME.
  Point assumed at beginning of new subdir line.
! You may redefine this function as you wish, e.g. like in dired-x.el."
    (end-of-line)
    (if dired-find-subdir (dired-goto-subdir dirname)) ; new
    (if dired-trivial-filenames (dired-goto-next-nontrivial-file)))
--- 1442,1448 ----
  (defun dired-initial-position (dirname)
    "Where point should go in a new listing of DIRNAME.
  Point assumed at beginning of new subdir line.
! You may redefine this function as you wish, e.g. like in `dired-x.el'."
    (end-of-line)
    (if dired-find-subdir (dired-goto-subdir dirname)) ; new
    (if dired-trivial-filenames (dired-goto-next-nontrivial-file)))
***************
*** 1550,1556 ****
  (defvar dired-x-hands-off-my-keys t
    "*Non-nil means don't bind `dired-x-find-file' over `find-file' on keyboard.
  Similarly for `dired-x-find-file-other-window' over `find-file-other-window'.
! If you change this variable after dired-x.el is loaded then do
  \\[dired-x-bind-find-file].")
  
  ;;; Bind `dired-x-find-file{-other-window}' over wherever
--- 1551,1557 ----
  (defvar dired-x-hands-off-my-keys t
    "*Non-nil means don't bind `dired-x-find-file' over `find-file' on keyboard.
  Similarly for `dired-x-find-file-other-window' over `find-file-other-window'.
! If you change this variable after `dired-x.el' is loaded then do
  \\[dired-x-bind-find-file].")
  
  ;;; Bind `dired-x-find-file{-other-window}' over wherever
***************
*** 1559,1565 ****
    "Bind `dired-x-find-file' in place of `find-file' \(or reverse\).
  Similarly for `dired-x-find-file-other-window' and `find-file-other-window'.
  Binding direction based on `dired-x-hands-off-my-keys'.
! This function part of `after-init-hook'."
    (interactive)
    (if (interactive-p)
        (setq dired-x-hands-off-my-keys
--- 1560,1566 ----
    "Bind `dired-x-find-file' in place of `find-file' \(or reverse\).
  Similarly for `dired-x-find-file-other-window' and `find-file-other-window'.
  Binding direction based on `dired-x-hands-off-my-keys'.
! This function is part of `after-init-hook'."
    (interactive)
    (if (interactive-p)
        (setq dired-x-hands-off-my-keys
***************
*** 1592,1600 ****
  See the function `display-buffer'.
  
  Identical to `find-file' except when called interactively, with a prefix arg
! \(e.g., \\[universal-argument]\), in which case it guesses filename near
! point.  Useful for editing file mentioned in buffer you are viewing, or to
! test if that file exists.  Use minibuffer after snatching filename."
    (interactive (list (read-filename-at-point "Find file: ")))
    (find-file (expand-file-name filename)))
  
--- 1593,1601 ----
  See the function `display-buffer'.
  
  Identical to `find-file' except when called interactively, with a prefix arg
! \(e.g., \\[universal-argument]\), in which case it guesses filename near 
point.
! Useful for editing file mentioned in buffer you are viewing,
! or to test if that file exists.  Use minibuffer after snatching filename."
    (interactive (list (read-filename-at-point "Find file: ")))
    (find-file (expand-file-name filename)))
  
***************
*** 1604,1612 ****
  See the function `display-buffer'.
  
  Identical to `find-file-other-window' except when called interactively, with a
! prefix arg \(e.g., \\[universal-argument]\), in which case it guesses filename
! near point.  Useful for editing file mentioned in buffer you are viewing, or
! to test if that file exists.  Use minibuffer after snatching filename."
    (interactive (list (read-filename-at-point "Find file: ")))
    (find-file-other-window (expand-file-name filename)))
  
--- 1605,1613 ----
  See the function `display-buffer'.
  
  Identical to `find-file-other-window' except when called interactively, with a
! prefix arg \(e.g., \\[universal-argument]\), in which case it guesses 
filename near point.
! Useful for editing file mentioned in buffer you are viewing,
! or to test if that file exists.  Use minibuffer after snatching filename."
    (interactive (list (read-filename-at-point "Find file: ")))
    (find-file-other-window (expand-file-name filename)))
  
***************
*** 1695,1701 ****
    "List of variables to be appended to reports sent by 
`dired-x-submit-report'.")
  
  (defun dired-x-submit-report ()
!   "Submit via reporter.el a bug report on program.
  Send report on `dired-x-file' version `dired-x-version,' to
  `dired-x-maintainer' at address `dired-x-help-address' listing
  variables `dired-x-variable-list' in the message."
--- 1696,1702 ----
    "List of variables to be appended to reports sent by 
`dired-x-submit-report'.")
  
  (defun dired-x-submit-report ()
!   "Submit via `reporter.el' a bug report on program.
  Send report on `dired-x-file' version `dired-x-version,' to
  `dired-x-maintainer' at address `dired-x-help-address' listing
  variables `dired-x-variable-list' in the message."