diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 559310ff770..86095780f67 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -981,7 +981,7 @@ data such as \"Index: ...\" and such." | |||
| 981 | ;; File starts *after* the starting point: we really weren't in | 981 | ;; File starts *after* the starting point: we really weren't in |
| 982 | ;; a file diff but elsewhere. | 982 | ;; a file diff but elsewhere. |
| 983 | (goto-char orig) | 983 | (goto-char orig) |
| 984 | (signal (car err) (cdr err))))) | 984 | (signal err)))) |
| 985 | 985 | ||
| 986 | (defun diff-file-kill (&optional delete) | 986 | (defun diff-file-kill (&optional delete) |
| 987 | "Kill current file's hunks. | 987 | "Kill current file's hunks. |
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index c0f6fd426c1..3744ec501ec 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -1444,7 +1444,7 @@ region, or with a numeric prefix. By default it uses a numeric prefix of 1." | |||
| 1444 | ;; conflicts instead! | 1444 | ;; conflicts instead! |
| 1445 | (condition-case err | 1445 | (condition-case err |
| 1446 | (smerge-match-conflict) | 1446 | (smerge-match-conflict) |
| 1447 | (error (if (not (markerp otherpos)) (signal (car err) (cdr err)) | 1447 | (error (if (not (markerp otherpos)) (signal err) |
| 1448 | (goto-char (prog1 otherpos (setq otherpos (point-marker)))) | 1448 | (goto-char (prog1 otherpos (setq otherpos (point-marker)))) |
| 1449 | (smerge-match-conflict)))) | 1449 | (smerge-match-conflict)))) |
| 1450 | (let ((beg (match-beginning 0)) | 1450 | (let ((beg (match-beginning 0)) |
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)))) |