diff options
| author | Juri Linkov <juri@linkov.net> | 2020-03-30 01:34:47 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2020-03-30 01:34:47 +0300 |
| commit | 7a6f5a5167037cdc3a0e9e312393781daedec085 (patch) | |
| tree | 4ecad790cfa5a3d82be76d7b672a22cce1153b02 /lisp/cedet | |
| parent | 1276c8e10b000b571a12227ebe9216cc6305ef7f (diff) | |
| download | emacs-7a6f5a5167037cdc3a0e9e312393781daedec085.tar.gz emacs-7a6f5a5167037cdc3a0e9e312393781daedec085.tar.bz2 emacs-7a6f5a5167037cdc3a0e9e312393781daedec085.zip | |
Support state changing VC operations on directories in Dired (bug#34949)
* lisp/dired-aux.el (dired-vc-next-action): New command.
(dired-vc-deduce-fileset): Rename from vc-dired-deduce-fileset in vc.el.
* lisp/dired.el (dired-mode-map): Remap vc-next-action to
dired-vc-next-action.
* lisp/vc/vc-dir.el (vc-dir-mark-files): New function.
(vc-dir-refresh): Run hook vc-dir-refresh-hook.
* lisp/vc/vc.el (vc-deduce-fileset): Rename arg 'observer' to
'not-state-changing' and document it in docstring.
(vc-dired-deduce-fileset): Rename to dired-vc-deduce-fileset in dired-aux.el.
* lisp/cedet/ede.el (ede-turn-on-hook, ede-minor-mode):
* lisp/desktop.el (desktop-minor-mode-table): Rename the long ago
obsolete vc-dired-mode to vc-dir-mode.
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/ede.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index c2036878288..8c336117c92 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -470,7 +470,7 @@ To be used in hook functions." ;; Emacs 21 has no buffer file name for directory edits. ;; so we need to add these hacks in. (eq major-mode 'dired-mode) - (eq major-mode 'vc-dired-mode)) + (eq major-mode 'vc-dir-mode)) (ede-minor-mode 1))) (define-minor-mode ede-minor-mode @@ -481,7 +481,7 @@ controlled project, then this mode is activated automatically provided `global-ede-mode' is enabled." :group 'ede (cond ((or (eq major-mode 'dired-mode) - (eq major-mode 'vc-dired-mode)) + (eq major-mode 'vc-dir-mode)) (ede-dired-minor-mode (if ede-minor-mode 1 -1))) (ede-minor-mode (if (not ede-constructing) |