diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-11-21 07:29:51 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-11-21 07:29:51 -0500 |
| commit | e14c4354cf29fab12fb414c7ebc94bf1a9920dd0 (patch) | |
| tree | 4e4fe11a659d99b35650161f7524a9c53d00130d | |
| parent | a131037e97fa2576c3d46763486b0bc7e213ad3b (diff) | |
| download | emacs-e14c4354cf29fab12fb414c7ebc94bf1a9920dd0.tar.gz | |
Fix bug that produced spurious nil state.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-src.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ffa38236b69..6bf57b6082b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-21 Eric S. Raymond <esr@snark> + + * vc/vc-src.el (vc-src-state): Fix bug that produced spurious nil state. + 2014-11-21 Eli Zaretskii <eliz@gnu.org> * vc/vc.el (vc-deduce-fileset): Support invocation from diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index d0787b033ee..520708c7eb0 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -159,6 +159,7 @@ For a description of possible values, see `vc-check-master-templates'." "SRC-specific version of `vc-state'." (let* ((status nil) + (default-directory (file-name-directory file)) (out (with-output-to-string (with-current-buffer @@ -168,7 +169,7 @@ For a description of possible values, see `vc-check-master-templates'." (condition-case nil (process-file vc-src-program nil t nil - "status" "-a" file) + "status" "-a" (file-relative-name file)) (error nil))))))) (when (eq 0 status) (when (null (string-match "does not exist or is unreadable" out)) |