X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e18afed7d695edac870ddf55aabc85c0a95a4b5f..c49e22560237d246bb2a5351b0c207559929ae52:/lisp/dired.el diff --git a/lisp/dired.el b/lisp/dired.el index 465e485a99..76809f992c 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1,7 +1,7 @@ ;;; dired.el --- directory-browsing commands -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992-1997, 2000-2012 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1992-1997, 2000-2013 Free Software +;; Foundation, Inc. ;; Author: Sebastian Kremer ;; Maintainer: FSF @@ -34,8 +34,6 @@ ;;; Code: -(eval-when-compile (require 'cl)) - ;;; Customizable variables (defgroup dired nil @@ -139,9 +137,12 @@ A value of t means move to first file." "Controls marking of renamed files. If t, files keep their previous marks when they are renamed. If a character, renamed files (whether previously marked or not) -are afterward marked with that character." +are afterward marked with that character. +This option affects only files renamed by `dired-do-rename' and +`dired-do-rename-regexp'. See `wdired-keep-marker-rename' +if you want to do the same for files renamed in WDired mode." :type '(choice (const :tag "Keep" t) - (character :tag "Mark")) + (character :tag "Mark" :value ?R)) :group 'dired-mark) (defcustom dired-keep-marker-copy ?C @@ -170,8 +171,9 @@ If a character, new links are unconditionally marked with that character." (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. +This means: if there is a Dired buffer displayed in the next +window, use its current directory, instead of this Dired buffer's +current directory. The target is used in the prompt for file copy, rename etc." :type 'boolean @@ -249,6 +251,10 @@ This is what the do-commands look for, and what the mark-commands store.") ;; 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.") +(make-obsolete-variable 'dired-shrink-to-fit + "use the Customization interface to add a new rule +to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\", +action argument symbol is `window-height' and its value is nil." "24.3") (defvar dired-file-version-alist) @@ -614,12 +620,14 @@ Optional third argument FILTER, if non-nil, is a function to select If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file, return (t FILENAME) instead of (FILENAME). Don't use that together with FILTER." - (let* ((all-of-them - (save-excursion - (dired-map-over-marks - (dired-get-filename localp) - arg nil distinguish-one-marked))) - result) + (let ((all-of-them + (save-excursion + (delq nil (dired-map-over-marks + (dired-get-filename localp 'no-error-if-not-filep) + arg nil distinguish-one-marked)))) + result) + (when (equal all-of-them '(t)) + (setq all-of-them nil)) (if (not filter) (if (and distinguish-one-marked (eq (car all-of-them) t)) all-of-them @@ -1332,16 +1340,16 @@ DIRED-FILENAME WINDOW-POINT)." "Mark all files remembered in ALIST. Each element of ALIST looks like (FILE . MARKERCHAR)." (let (elt fil chr) - (while alist - (setq elt (car alist) - alist (cdr alist) - fil (car elt) - chr (cdr elt)) - (if (dired-goto-file fil) - (save-excursion - (beginning-of-line) - (delete-char 1) - (insert chr)))))) + (save-excursion + (while alist + (setq elt (car alist) + alist (cdr alist) + fil (car elt) + chr (cdr elt)) + (when (dired-goto-file fil) + (beginning-of-line) + (delete-char 1) + (insert chr)))))) (defun dired-remember-hidden () "Return a list of names of subdirs currently hidden." @@ -1411,7 +1419,6 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map "&" 'dired-do-async-shell-command) ;; Comparison commands (define-key map "=" 'dired-diff) - (define-key map "\M-=" 'dired-backup-diff) ;; Tree Dired commands (define-key map "\M-\C-?" 'dired-unmark-all-files) (define-key map "\M-\C-d" 'dired-tree-down) @@ -1495,6 +1502,8 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map (kbd "M-s f C-s") 'dired-isearch-filenames) (define-key map (kbd "M-s f M-C-s") 'dired-isearch-filenames-regexp) ;; misc + (define-key map [remap read-only-mode] 'dired-toggle-read-only) + ;; `toggle-read-only' is an obsolete alias for `read-only-mode' (define-key map [remap toggle-read-only] 'dired-toggle-read-only) (define-key map "?" 'dired-summary) (define-key map "\177" 'dired-unmark-backward) @@ -1740,7 +1749,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar operate epa-dired-do-decrypt] - '(menu-item "Decrypt" epa-dired-do-decrypt + '(menu-item "Decrypt..." epa-dired-do-decrypt :help "Decrypt file at cursor")) (define-key map @@ -1750,12 +1759,12 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar operate epa-dired-do-sign] - '(menu-item "Sign" epa-dired-do-sign + '(menu-item "Sign..." epa-dired-do-sign :help "Create digital signature of file at cursor")) (define-key map [menu-bar operate epa-dired-do-encrypt] - '(menu-item "Encrypt" epa-dired-do-encrypt + '(menu-item "Encrypt..." epa-dired-do-encrypt :help "Encrypt file at cursor")) (define-key map [menu-bar operate dashes-3] @@ -1877,7 +1886,6 @@ for more info): `dired-listing-switches' `dired-trivial-filenames' - `dired-shrink-to-fit' `dired-marker-char' `dired-del-marker' `dired-keep-marker-rename' @@ -1957,15 +1965,14 @@ You can use it to recover marks, killed lines or subdirs." Actual changes in files cannot be undone by Emacs.")) (defun dired-toggle-read-only () - "Edit dired buffer with Wdired, or set it read-only. -Call `wdired-change-to-wdired-mode' in dired buffers whose editing is -supported by Wdired (the major mode of the dired buffer is `dired-mode'). -Otherwise, for buffers inheriting from dired-mode, call `toggle-read-only'." + "Edit Dired buffer with Wdired, or make it read-only. +If the current buffer can be edited with Wdired, (i.e. the major +mode is `dired-mode'), call `wdired-change-to-wdired-mode'. +Otherwise, call `toggle-read-only'." (interactive) - (if (eq major-mode 'dired-mode) + (if (derived-mode-p 'dired-mode) (wdired-change-to-wdired-mode) - (with-no-warnings - (toggle-read-only)))) + (read-only-mode 'toggle))) (defun dired-next-line (arg) "Move down lines then position at filename. @@ -2209,10 +2216,11 @@ Optional arg GLOBAL means to replace all matches." ;; dired-get-filename. (concat (or dir default-directory) file)) -(defun dired-make-relative (file &optional dir _ignore) +(defun dired-make-relative (file &optional dir) "Convert FILE (an absolute file name) to a name relative to DIR. -If this is impossible, return FILE unchanged. -DIR must be a directory name, not a file name." +If DIR is omitted or nil, it defaults to `default-directory'. +If FILE is not in the directory tree of DIR, return FILE +unchanged." (or dir (setq dir default-directory)) ;; This case comes into play if default-directory is set to ;; use ~. @@ -2220,8 +2228,6 @@ DIR must be a directory name, not a file name." (setq dir (expand-file-name dir))) (if (string-match (concat "^" (regexp-quote dir)) file) (substring file (match-end 0)) -;;; (or no-error -;;; (error "%s: not in directory tree growing at %s" file dir)) file)) ;;; Functions for finding the file name in a dired buffer line. @@ -2467,8 +2473,6 @@ You can then feed the file name(s) to other commands with \\[yank]." dired-subdir-alist)))) cur-dir)))) -;(defun dired-get-subdir-min (elt) -; (cdr elt)) ;; can't use macro, must be redefinable for other alist format in dired-nstd. (defalias 'dired-get-subdir-min 'cdr) @@ -2730,12 +2734,14 @@ Optional argument means return a file name relative to `default-directory'." ;; Deleting files (defcustom dired-recursive-deletes 'top - "Decide whether recursive deletes are allowed. -A value of nil means no recursive deletes. -`always' means delete recursively without asking. This is DANGEROUS! -`top' means ask for each directory at top level, but delete its subdirectories -without asking. -Anything else means ask for each directory." + "Whether Dired deletes directories recursively. +If nil, Dired will not delete non-empty directories. +`always' means to delete non-empty directories recursively, +without asking. This is dangerous! +`top' means to ask for each top-level directory specified by the +Dired deletion command, and delete its subdirectories without +asking. +Any other value means to ask for each directory." :type '(choice :tag "Delete non-empty directories" (const :tag "Yes" always) (const :tag "No--only delete empty directories" nil) @@ -2942,6 +2948,7 @@ or \"* [3 files]\"." (defun dired-pop-to-buffer (buf) "Pop up buffer BUF in a way suitable for Dired." + (declare (obsolete dired-mark-pop-up "24.3")) (let ((split-window-preferred-function (lambda (window) (or (and (let ((split-height-threshold 0)) @@ -2953,6 +2960,8 @@ or \"* [3 files]\"." (split-window-sensibly window)))) pop-up-frames) (pop-to-buffer (get-buffer-create buf))) + ;; See Bug#12281. + (set-window-start nil (point-min)) ;; If dired-shrink-to-fit is t, make its window fit its contents. (when dired-shrink-to-fit ;; Try to not delete window when we want to display less than @@ -2974,36 +2983,49 @@ If t, confirmation is never needed." (const shell) (const symlink) (const touch) (const uncompress)))) -(defun dired-mark-pop-up (bufname op-symbol files function &rest args) +(defun dired-mark-pop-up (buffer-or-name op-symbol files function &rest args) "Return FUNCTION's result on ARGS after showing which files are marked. -Displays the file names in a buffer named BUFNAME; - nil gives \" *Marked Files*\". -This uses function `dired-pop-to-buffer' to do that. - -FUNCTION should not manipulate files, just read input - (an argument or confirmation). -The window is not shown if there is just one file or - OP-SYMBOL is a member of the list in `dired-no-confirm'. +Displays the file names in a window showing a buffer named +BUFFER-OR-NAME; the default name being \" *Marked Files*\". The +window is not shown if there is just one file, `dired-no-confirm' +is t, or OP-SYMBOL is a member of the list in `dired-no-confirm'. + +By default, Dired shrinks the display buffer to fit the marked files. +To disable this, use the Customization interface to add a new rule +to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\", +action argument symbol is `window-height' and its value is nil. + FILES is the list of marked files. It can also be (t FILENAME) in the case of one marked file, to distinguish that from using -just the current file." - (or bufname (setq bufname " *Marked Files*")) +just the current file. + +FUNCTION should not manipulate files, just read input \(an +argument or confirmation)." (if (or (eq dired-no-confirm t) (memq op-symbol dired-no-confirm) ;; If FILES defaulted to the current line's file. (= (length files) 1)) (apply function args) - (with-current-buffer (get-buffer-create bufname) - (erase-buffer) - ;; Handle (t FILE) just like (FILE), here. - ;; That value is used (only in some cases), to mean - ;; just one file that was marked, rather than the current line file. - (dired-format-columns-of-files (if (eq (car files) t) (cdr files) files)) - (remove-text-properties (point-min) (point-max) - '(mouse-face nil help-echo nil))) - (save-window-excursion - (dired-pop-to-buffer bufname) - (apply function args)))) + (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*")))) + (with-current-buffer buffer + (let ((split-height-threshold 0)) + (with-temp-buffer-window + buffer + (cons 'display-buffer-below-selected + '((window-height . fit-window-to-buffer))) + #'(lambda (window _value) + (with-selected-window window + (unwind-protect + (apply function args) + (when (window-live-p window) + (quit-restore-window window 'kill))))) + ;; Handle (t FILE) just like (FILE), here. That value is + ;; used (only in some cases), to mean just one file that was + ;; marked, rather than the current line file. + (dired-format-columns-of-files + (if (eq (car files) t) (cdr files) files)) + (remove-text-properties (point-min) (point-max) + '(mouse-face nil help-echo nil)))))))) (defun dired-format-columns-of-files (files) (let ((beg (point))) @@ -3089,41 +3111,66 @@ just the current file." (insert dired-marker-char))) (forward-line 1)))) -(defun dired-mark (arg) - "Mark the current (or next ARG) files. +(defun dired-mark (arg &optional interactive) + "Mark the file at point in the Dired buffer. +If the region is active, mark all files in the region. +Otherwise, with a prefix arg, mark files on the next ARG lines. + If on a subdir headerline, mark all its files except `.' and `..'. Use \\[dired-unmark-all-files] to remove all marks and \\[dired-unmark] on a subdir to remove the marks in this subdir." - (interactive "P") - (if (dired-get-subdir) - (save-excursion (dired-mark-subdir-files)) + (interactive (list current-prefix-arg t)) + (cond + ;; Mark files in the active region. + ((and interactive (use-region-p)) + (save-excursion + (let ((beg (region-beginning)) + (end (region-end))) + (dired-mark-files-in-region + (progn (goto-char beg) (line-beginning-position)) + (progn (goto-char end) (line-beginning-position)))))) + ;; Mark subdir files from the subdir headerline. + ((dired-get-subdir) + (save-excursion (dired-mark-subdir-files))) + ;; Mark the current (or next ARG) files. + (t (let ((inhibit-read-only t)) (dired-repeat-over-lines (prefix-numeric-value arg) - (function (lambda () (delete-char 1) (insert dired-marker-char))))))) + (function (lambda () (delete-char 1) (insert dired-marker-char)))))))) -(defun dired-unmark (arg) - "Unmark the current (or next ARG) files. -If looking at a subdir, unmark all its files except `.' and `..'." - (interactive "P") +(defun dired-unmark (arg &optional interactive) + "Unmark the file at point in the Dired buffer. +If the region is active, unmark all files in the region. +Otherwise, with a prefix arg, unmark files on the next ARG lines. + +If looking at a subdir, unmark all its files except `.' and `..'. +If the region is active in Transient Mark mode, unmark all files +in the active region." + (interactive (list current-prefix-arg t)) (let ((dired-marker-char ?\040)) - (dired-mark arg))) + (dired-mark arg interactive))) -(defun dired-flag-file-deletion (arg) +(defun dired-flag-file-deletion (arg &optional interactive) "In Dired, flag the current line's file for deletion. -With prefix arg, repeat over several lines. +If the region is active, flag all files in the region. +Otherwise, with a prefix arg, flag files on the next ARG lines. -If on a subdir headerline, mark all its files except `.' and `..'." - (interactive "P") +If on a subdir headerline, flag all its files except `.' and `..'. +If the region is active in Transient Mark mode, flag all files +in the active region." + (interactive (list current-prefix-arg t)) (let ((dired-marker-char dired-del-marker)) - (dired-mark arg))) + (dired-mark arg interactive))) (defun dired-unmark-backward (arg) "In Dired, move up lines and remove marks or deletion flags there. Optional prefix ARG says how many lines to unmark/unflag; default -is one line." +is one line. +If the region is active in Transient Mark mode, unmark all files +in the active region." (interactive "p") (dired-unmark (- arg))) @@ -3154,8 +3201,8 @@ As always, hidden subdirs are not affected." (defvar dired-regexp-history nil "History list of regular expressions used in Dired commands.") -(defun dired-read-regexp (prompt) - (read-from-minibuffer prompt nil nil nil 'dired-regexp-history)) +(defun dired-read-regexp (prompt &optional default history) + (read-regexp prompt default (or history 'dired-regexp-history))) (defun dired-mark-files-regexp (regexp &optional marker-char) "Mark all files matching REGEXP for use in later commands. @@ -3460,9 +3507,9 @@ format, use `\\[universal-argument] \\[dired]'.") "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. - ;; Modeline display of "by name" or "by date" guarantees the user a +(defun dired-sort-set-mode-line () + ;; Set mode line display according to dired-actual-switches. + ;; Mode line display of "by name" or "by date" guarantees the user a ;; match with the corresponding regexps. Non-matching switches are ;; shown literally. (when (eq major-mode 'dired-mode) @@ -3478,6 +3525,9 @@ The idea is to set this buffer-locally in special dired buffers.") (concat "Dired " dired-actual-switches))))) (force-mode-line-update))) +(define-obsolete-function-alias 'dired-sort-set-modeline + 'dired-sort-set-mode-line "24.3") + (defun dired-sort-toggle-or-edit (&optional arg) "Toggle sorting by date, and refresh the Dired buffer. With a prefix argument, edit the current listing switches instead." @@ -3507,9 +3557,16 @@ With a prefix argument, edit the current listing switches instead." (setq dired-actual-switches (replace-match "" t t dired-actual-switches 3)))) ;; Now, if we weren't sorting by date before, add the -t switch. + ;; Some simple-minded ls implementations (eg ftp servers) only + ;; allow a single option string, so try not to add " -t" if possible. (unless sorting-by-date - (setq dired-actual-switches (concat dired-actual-switches " -t")))) - (dired-sort-set-modeline) + (setq dired-actual-switches + (concat dired-actual-switches + (if (string-match-p "\\`-[[:alnum:]]+\\'" + dired-actual-switches) + "t" + " -t"))))) + (dired-sort-set-mode-line) (revert-buffer)) ;; Some user code loads dired especially for this. @@ -3532,7 +3589,7 @@ set the minor mode accordingly, others appear literally in the mode line. With optional second arg NO-REVERT, don't refresh the listing afterwards." (dired-sort-R-check switches) (setq dired-actual-switches switches) - (dired-sort-set-modeline) + (dired-sort-set-mode-line) (or no-revert (revert-buffer))) (defvar dired-subdir-alist-pre-R nil @@ -3574,11 +3631,11 @@ To be called first in body of `dired-sort-other', etc." ;;;; Drag and drop support (defcustom dired-recursive-copies 'top - "Decide whether recursive copies are allowed. -A value of nil means no recursive copies. -`always' means copy recursively without asking. -`top' means ask for each directory at top level. -Anything else means ask for each directory." + "Whether Dired copies directories recursively. +If nil, never copy recursively. +`always' means to copy recursively without asking. +`top' means to ask for each directory at top level. +Any other value means to ask for each directory." :type '(choice :tag "Copy directories" (const :tag "No recursive copies" nil) (const :tag "Ask for each directory" t) @@ -3736,16 +3793,22 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "de7e4c64718c8ba8438a6397a460bf23") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "066bb17769887a7fbc0490003f59e4b3") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ Compare file at point with file FILE using `diff'. -FILE defaults to the file at the mark. (That's the mark set by -\\[set-mark-command], not by Dired's \\[dired-mark] command.) -The prompted-for FILE is the first file given to `diff'. -With prefix arg, prompt for second argument SWITCHES, -which is the string of command switches for `diff'. +If called interactively, prompt for FILE. If the file at point +has a backup file, use that as the default. If the mark is active +in Transient Mark mode, use the file at the mark as the default. +\(That's the mark set by \\[set-mark-command], not by Dired's +\\[dired-mark] command.) + +FILE is the first file given to `diff'. The file at point +is the second file given to `diff'. + +With prefix arg, prompt for second argument SWITCHES, which is +the string of command switches for the third argument of `diff'. \(fn FILE &optional SWITCHES)" t nil) @@ -3789,22 +3852,30 @@ Examples of PREDICATE: (autoload 'dired-do-chmod "dired-aux" "\ Change the mode of the marked (or next ARG) files. Symbolic modes like `g+w' are allowed. +Type M-n to pull the file attributes of the file at point +into the minibuffer. \(fn &optional ARG)" t nil) (autoload 'dired-do-chgrp "dired-aux" "\ Change the group of the marked (or next ARG) files. +Type M-n to pull the file attributes of the file at point +into the minibuffer. \(fn &optional ARG)" t nil) (autoload 'dired-do-chown "dired-aux" "\ Change the owner of the marked (or next ARG) files. +Type M-n to pull the file attributes of the file at point +into the minibuffer. \(fn &optional ARG)" t nil) (autoload 'dired-do-touch "dired-aux" "\ Change the timestamp of the marked (or next ARG) files. This calls touch. +Type M-n to pull the file attributes of the file at point +into the minibuffer. \(fn &optional ARG)" t nil) @@ -3829,15 +3900,24 @@ with a prefix argument. (autoload 'dired-do-async-shell-command "dired-aux" "\ Run a shell command COMMAND on the marked files asynchronously. -Like `dired-do-shell-command' but if COMMAND doesn't end in ampersand, -adds `* &' surrounded by whitespace and executes the command asynchronously. +Like `dired-do-shell-command', but adds `&' at the end of COMMAND +to execute it asynchronously. + +When operating on multiple files, asynchronous commands +are executed in the background on each file in parallel. +In shell syntax this means separating the individual commands +with `&'. However, when COMMAND ends in `;' or `;&' then commands +are executed in the background on each file sequentially waiting +for each command to terminate before running the next command. +In shell syntax this means separating the individual commands with `;'. + The output appears in the buffer `*Async Shell Command*'. \(fn COMMAND &optional ARG FILE-LIST)" t nil) (autoload 'dired-do-shell-command "dired-aux" "\ Run a shell command COMMAND on the marked files. -If no files are marked or a specific numeric prefix arg is given, +If no files are marked or a numeric prefix arg is given, the next ARG files are used. Just \\[universal-argument] means the current file. The prompt mentions the file(s) or the marker, as appropriate. @@ -3859,7 +3939,17 @@ If you want to use `*' as a shell wildcard with whitespace around it, write `*\"\"' in place of just `*'. This is equivalent to just `*' in the shell, but avoids Dired's special handling. -If COMMAND produces output, it goes to a separate buffer. +If COMMAND ends in `&', `;', or `;&', it is executed in the +background asynchronously, and the output appears in the buffer +`*Async Shell Command*'. When operating on multiple files and COMMAND +ends in `&', the shell command is executed on each file in parallel. +However, when COMMAND ends in `;' or `;&' then commands are executed +in the background on each file sequentially waiting for each command +to terminate before running the next command. You can also use +`dired-do-async-shell-command' that automatically adds `&'. + +Otherwise, COMMAND is executed synchronously, and the output +appears in the buffer `*Shell Command Output*'. This feature does not try to redisplay Dired buffers afterward, as there's no telling what files COMMAND may have changed. @@ -3976,16 +4066,21 @@ If DIRECTORY already exists, signal an error. (autoload 'dired-do-copy "dired-aux" "\ Copy all marked (or next ARG) files, or copy the current file. -This normally preserves the last-modified date when copying. -When operating on just the current file, you specify the new name. -When operating on multiple or marked files, you specify a directory, -and new copies of these files are made in that directory -with the same names that the files currently have. The default -suggested for the target directory depends on the value of -`dired-dwim-target', which see. +When operating on just the current file, prompt for the new name. -This command copies symbolic links by creating new ones, -like `cp -d'. +When operating on multiple or marked files, prompt for a target +directory, and make the new copies in that directory, with the +same names as the original files. The initial suggestion for the +target directory is the Dired buffer's current directory (or, if +`dired-dwim-target' is non-nil, the current directory of a +neighboring Dired window). + +If `dired-copy-preserve-time' is non-nil, this command preserves +the modification time of each old file in the copy, similar to +the \"-p\" option for the \"cp\" shell command. + +This command copies symbolic links by creating new ones, similar +to the \"-d\" option for the \"cp\" shell command. \(fn &optional ARG)" t nil) @@ -4088,9 +4183,10 @@ See Info node `(emacs)Subdir switches' for more details. \(fn DIRNAME &optional SWITCHES NO-ERROR-IF-NOT-DIR-P)" t nil) (autoload 'dired-insert-subdir "dired-aux" "\ -Insert this subdirectory into the same dired buffer. -If it is already present, overwrites previous entry, - else inserts it at its natural place (as `ls -lR' would have done). +Insert this subdirectory into the same Dired buffer. +If it is already present, overwrite the previous entry; + otherwise, insert it at its natural place (as `ls -lR' would + have done). With a prefix arg, you may edit the `ls' switches used for this listing. You can add `R' to the switches to expand the whole tree starting at this subdirectory. @@ -4200,7 +4296,7 @@ instead. ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) -;;;;;; "dired-x" "dired-x.el" "d09d49d54080e60ad6ecee5573b4e517") +;;;;;; "dired-x" "dired-x.el" "ce753ade80ea9f4e64ab3569e3a5421e") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\