diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-02-24 06:30:11 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-02-24 06:30:11 +0100 |
| commit | 1bed13111be2954e418f3cf43f30944ea5b82055 (patch) | |
| tree | ee63f7ad6a03b0bf1af5f45e3f0ef1085883c2bd /lisp/dired-aux.el | |
| parent | 0a361fd91abfc34cffad61fcc552a7cd64126f12 (diff) | |
| parent | b0cbd5590b238fa9001e3f07b7035704ef976722 (diff) | |
| download | emacs-1bed13111be2954e418f3cf43f30944ea5b82055.tar.gz | |
Merge from origin/emacs-29
b0cbd5590b2 Eglot: simplify inlay hints implementation with jit-lock
91e24c5b5a6 Eglot: update inlay hints on window configuration changes
79fead1709f ; Fix a typo in a doc string in c-ts-common.el (bug#61736).
a0b273ef300 ; Clarify documentation of 'file-modes-number-to-symbolic'
5c2be6a2632 ; Fix recently-added doc strings in eglot.el
e3be0dbf85c Eglot: display completion label when safe
5286111ea1f Improve documentation of VC commands, including in Dired
990f4027131 * doc/emacs/maintaining.texi: More mentions of marked fil...
Diffstat (limited to 'lisp/dired-aux.el')
| -rw-r--r-- | lisp/dired-aux.el | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 6cb097f6bb3..96ac9da4508 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -3741,12 +3741,21 @@ of the target of the link instead." ;;;###autoload (defun dired-vc-next-action (verbose) - "Do the next version control operation on marked files/directories. -When only files are marked then call `vc-next-action' with the -same value of the VERBOSE argument. -When also directories are marked then call `vc-dir' and mark -the same files/directories in the VC-Dir buffer that were marked -in the Dired buffer." + "Do the next logical version control operation on marked files/directories. +The VC control operation will operate on a fileset which includes +the marked files/directories. If no files/directories are marked, the +fileset will include the single file/directory shown on the current line. + +If only regular files are in the fileset, call `vc-next-action' with +the same value of the VERBOSE argument (interactively, the prefix +argument). + +If one or more directories are in the fileset, start `vc-dir' in the root +directory of the repository that includes the current directory, with +the same files/directories marked in the VC-Directory buffer that were +marked in the original Dired buffer. If the current directory doesn't +belong to a VCS repository, prompt for a repository directory. In this +case, the VERBOSE argument is ignored." (interactive "P") (let* ((marked-files (dired-get-marked-files nil nil nil nil t)) |