Fix bug that produced spurious nil state.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffa38236b69b179125d747455b6adf9b4e0d0c1a..6bf57b6082bb3c438fc500a445f0af48b3dfa9f5 100644 (file)
--- 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 d0787b033eee20bf8d95a2732ff80a3f43a31dd9..520708c7eb0ac4d6b46d8507fe988d5620039cc1 100644 (file)
--- 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))