aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2018-02-13 12:13:27 +0100
committerAndreas Schwab2018-02-13 12:18:25 +0100
commit69e804669bacfef05c1ecdcd3f664dd486273db4 (patch)
tree57381ec6c82102132ced367e3fdfe78a296351f9
parentf568c916b6d1e20e18fced8d773aa8f86e7c576f (diff)
downloademacs-69e804669bacfef05c1ecdcd3f664dd486273db4.tar.gz
emacs-69e804669bacfef05c1ecdcd3f664dd486273db4.zip
Don't signal error in vc-deduce-backend
* lisp/vc/vc.el (vc-deduce-backend): Return nil if vc-responsible-backend signals an error.
-rw-r--r--lisp/vc/vc.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 6516c91de3c..e767deace2e 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -996,7 +996,9 @@ Within directories, only files already under version control are noticed."
996 ((derived-mode-p 'diff-mode) diff-vc-backend) 996 ((derived-mode-p 'diff-mode) diff-vc-backend)
997 ;; Maybe we could even use comint-mode rather than shell-mode? 997 ;; Maybe we could even use comint-mode rather than shell-mode?
998 ((derived-mode-p 'dired-mode 'shell-mode 'compilation-mode) 998 ((derived-mode-p 'dired-mode 'shell-mode 'compilation-mode)
999 (vc-responsible-backend default-directory)) 999 (condition-case nil
1000 (vc-responsible-backend default-directory)
1001 (error nil)))
1000 (vc-mode (vc-backend buffer-file-name)))) 1002 (vc-mode (vc-backend buffer-file-name))))
1001 1003
1002(declare-function vc-dir-current-file "vc-dir" ()) 1004(declare-function vc-dir-current-file "vc-dir" ())