diff options
| author | Eric S. Raymond | 2014-11-21 07:29:51 -0500 |
|---|---|---|
| committer | Eric S. Raymond | 2014-11-21 07:29:51 -0500 |
| commit | e14c4354cf29fab12fb414c7ebc94bf1a9920dd0 (patch) | |
| tree | 4e4fe11a659d99b35650161f7524a9c53d00130d | |
| parent | a131037e97fa2576c3d46763486b0bc7e213ad3b (diff) | |
| download | emacs-e14c4354cf29fab12fb414c7ebc94bf1a9920dd0.tar.gz emacs-e14c4354cf29fab12fb414c7ebc94bf1a9920dd0.zip | |
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 @@ | |||
| 1 | 2014-11-21 Eric S. Raymond <esr@snark> | ||
| 2 | |||
| 3 | * vc/vc-src.el (vc-src-state): Fix bug that produced spurious nil state. | ||
| 4 | |||
| 1 | 2014-11-21 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-11-21 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * vc/vc.el (vc-deduce-fileset): Support invocation from | 7 | * 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'." | |||
| 159 | "SRC-specific version of `vc-state'." | 159 | "SRC-specific version of `vc-state'." |
| 160 | (let* | 160 | (let* |
| 161 | ((status nil) | 161 | ((status nil) |
| 162 | (default-directory (file-name-directory file)) | ||
| 162 | (out | 163 | (out |
| 163 | (with-output-to-string | 164 | (with-output-to-string |
| 164 | (with-current-buffer | 165 | (with-current-buffer |
| @@ -168,7 +169,7 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 168 | (condition-case nil | 169 | (condition-case nil |
| 169 | (process-file | 170 | (process-file |
| 170 | vc-src-program nil t nil | 171 | vc-src-program nil t nil |
| 171 | "status" "-a" file) | 172 | "status" "-a" (file-relative-name file)) |
| 172 | (error nil))))))) | 173 | (error nil))))))) |
| 173 | (when (eq 0 status) | 174 | (when (eq 0 status) |
| 174 | (when (null (string-match "does not exist or is unreadable" out)) | 175 | (when (null (string-match "does not exist or is unreadable" out)) |