diff options
Diffstat (limited to 'lisp/vc/vc.el')
| -rw-r--r-- | lisp/vc/vc.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 0d8e1dd0350..37d2bc3612f 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2045,7 +2045,7 @@ After check-out, runs the normal hook `vc-checkout-hook'." | |||
| 2045 | (when t | 2045 | (when t |
| 2046 | (let ((buf (get-file-buffer file))) | 2046 | (let ((buf (get-file-buffer file))) |
| 2047 | (when buf (with-current-buffer buf (read-only-mode -1))))) | 2047 | (when buf (with-current-buffer buf (read-only-mode -1))))) |
| 2048 | (signal (car err) (cdr err)))) | 2048 | (signal err))) |
| 2049 | `((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit) | 2049 | `((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit) |
| 2050 | nil) | 2050 | nil) |
| 2051 | 'up-to-date | 2051 | 'up-to-date |
| @@ -3581,8 +3581,8 @@ BACKEND is the VC backend." | |||
| 3581 | (condition-case err | 3581 | (condition-case err |
| 3582 | (vc-call-backend backend 'root default-directory) | 3582 | (vc-call-backend backend 'root default-directory) |
| 3583 | (vc-not-supported | 3583 | (vc-not-supported |
| 3584 | (unless (eq (cadr err) 'root) | 3584 | (unless (eq (error-slot-value err 1) 'root) |
| 3585 | (signal (car err) (cdr err))) | 3585 | (signal err)) |
| 3586 | nil)))) | 3586 | nil)))) |
| 3587 | 3587 | ||
| 3588 | ;;;###autoload | 3588 | ;;;###autoload |
| @@ -4695,7 +4695,7 @@ tip revision are merged into the working file." | |||
| 4695 | (and-let* ((fileset (vc-deduce-fileset 'not-state-changing | 4695 | (and-let* ((fileset (vc-deduce-fileset 'not-state-changing |
| 4696 | 'allow-unregistered))) | 4696 | 'allow-unregistered))) |
| 4697 | (vc-find-backend-function (car fileset) 'pull))) | 4697 | (vc-find-backend-function (car fileset) 'pull))) |
| 4698 | (signal (car ret) (cdr ret)))) | 4698 | (signal ret))) |
| 4699 | (:success | 4699 | (:success |
| 4700 | (setq backend (car ret) files (cadr ret) | 4700 | (setq backend (car ret) files (cadr ret) |
| 4701 | fn (vc-find-backend-function backend 'pull)))) | 4701 | fn (vc-find-backend-function backend 'pull)))) |