diff options
| author | Juri Linkov <juri@linkov.net> | 2020-07-02 01:08:18 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2020-07-02 01:08:18 +0300 |
| commit | c70a3a41630a39283f10f183cefb4643a6d424cc (patch) | |
| tree | 3dfd7c8d864d035a14e9b104067be66e89c3afe7 /lisp | |
| parent | aa6c35e95f8f5014894c3c8db33524b70d4ee055 (diff) | |
| download | emacs-c70a3a41630a39283f10f183cefb4643a6d424cc.tar.gz emacs-c70a3a41630a39283f10f183cefb4643a6d424cc.tar.bz2 emacs-c70a3a41630a39283f10f183cefb4643a6d424cc.zip | |
Revert feature added in bfd96e995d using project directories in vc (bug#41821)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/vc-dir.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 5 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 6 |
3 files changed, 3 insertions, 10 deletions
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 46be9b73801..cdf8ab984e8 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1366,7 +1366,7 @@ These are the commands available for use in the file status buffer: ;; Otherwise if you do C-x v d -> C-x C-f -> C-x v d ;; you may get a new *vc-dir* buffer, different from the original (file-truename (read-directory-name "VC status for directory: " - (vc-root-dir) (vc-known-roots) t + (vc-root-dir) nil t nil)) (if current-prefix-arg (intern diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 46f55358de8..ce72a49b955 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -299,11 +299,6 @@ non-nil if FILE exists and its contents were successfully inserted." (set-buffer-modified-p nil) t)) -(declare-function project-try-vc "project") -(defun vc-known-roots () - "Return a list of known vc roots." - (seq-filter #'project-try-vc (project-known-project-roots))) - (defun vc-find-root (file witness) "Find the root of a checked out project. The function walks up the directory tree from FILE looking for WITNESS. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 49323ef47d2..65775f8e46e 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2001,8 +2001,7 @@ saving the buffer." rootdir working-revision) (if backend (setq rootdir (vc-call-backend backend 'root default-directory)) - (setq rootdir (read-directory-name "Directory for VC root-diff: " - nil (vc-known-roots))) + (setq rootdir (read-directory-name "Directory for VC root-diff: ")) (setq backend (vc-responsible-backend rootdir)) (if backend (setq default-directory rootdir) @@ -2546,8 +2545,7 @@ with its diffs (if the underlying VCS supports that)." rootdir) (if backend (setq rootdir (vc-call-backend backend 'root default-directory)) - (setq rootdir (read-directory-name "Directory for VC revision log: " - nil (vc-known-roots))) + (setq rootdir (read-directory-name "Directory for VC revision log: ")) (setq backend (vc-responsible-backend rootdir)) (unless backend (error "Directory is not version controlled"))) |