diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-04-14 20:28:18 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-04-14 20:28:18 +0200 |
| commit | 1b98a68b660501c44d3a142a12ee35e3c215b05a (patch) | |
| tree | 112df43fac47a5c0798400e8b351cf606622bf08 /lisp | |
| parent | 32364bbbaa8bda68228a3b0191c0b340c252d2a2 (diff) | |
| download | emacs-1b98a68b660501c44d3a142a12ee35e3c215b05a.tar.gz emacs-1b98a68b660501c44d3a142a12ee35e3c215b05a.tar.bz2 emacs-1b98a68b660501c44d3a142a12ee35e3c215b05a.zip | |
Fix Bug#20637. Do not merge to master
* lisp/vc/vc-hooks.el (vc-state, vc-working-revision):
Use `vc-backend' instead of `vc-responsible-backend'. (Bug#20637)
* test/automated/vc-tests.el (vc-test--state)
(vc-test--working-revision): Deactivate now failing checks.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/vc-hooks.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 0826744c7cd..4b5ec27d3ca 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -476,7 +476,7 @@ status of this file. Otherwise, the value returned is one of: ;; - `copied' and `moved' (might be handled by `removed' and `added') (or (vc-file-getprop file 'vc-state) (when (> (length file) 0) ;Why?? --Stef - (setq backend (or backend (vc-responsible-backend file))) + (setq backend (or backend (vc-backend file))) (when backend (vc-state-refresh file backend))))) @@ -495,7 +495,7 @@ status of this file. Otherwise, the value returned is one of: If FILE is not registered, this function always returns nil." (or (vc-file-getprop file 'vc-working-revision) (progn - (setq backend (or backend (vc-responsible-backend file))) + (setq backend (or backend (vc-backend file))) (when backend (vc-file-setprop file 'vc-working-revision (vc-call-backend backend 'working-revision file)))))) |