diff options
| author | Andrii Kolomoiets <andreyk.mad@gmail.com> | 2020-09-03 22:13:36 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2020-09-05 00:16:39 +0300 |
| commit | f450798cb0b9bedfa73efff14605a04eec4f1d9e (patch) | |
| tree | 829e66813bbda4a2cd1e2c2a4206332c7ca0e218 | |
| parent | 9e5fd29bede00905d7ff95ea213c2e2f47944e61 (diff) | |
| download | emacs-f450798cb0b9bedfa73efff14605a04eec4f1d9e.tar.gz | |
Don't move point in vc-dir on vc-register/vc-checkin (bug#43188)
* lisp/vc/vc-dir.el (vc-dir-update):
Save and restore point on 'ewoc-invalidate'.
* lisp/vc/vc-dispatcher.el (vc-finish-logentry):
Don't call 'vc-dir-move-to-goal-column'.
* lisp/vc/vc.el (vc-register): Don't call 'vc-dir-move-to-goal-column'.
| -rw-r--r-- | lisp/vc/vc-dir.el | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 3 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index cdf8ab984e8..6c219005cea 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -451,7 +451,11 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc." (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry)) (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry)) (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil) - (ewoc-invalidate vc-ewoc node)) + ;; `ewoc-invalidate' will kill line and insert new text, + ;; let's keep point column. + (let ((p (point))) + (ewoc-invalidate vc-ewoc node) + (goto-char p))) ;; If the state is nil, the file does not exist ;; anymore, so remember the entry so we can remove ;; it after we are done inserting all ENTRIES. diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 4a04c9365a5..99bf5bf9b64 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -691,7 +691,6 @@ BACKEND, if non-nil, specifies a VC backend for the Log Edit buffer." (message "%s Type C-c C-c when done" msg) (vc-finish-logentry (eq comment t))))) -(declare-function vc-dir-move-to-goal-column "vc-dir" ()) ;; vc-finish-logentry is typically called from a log-edit buffer (see ;; vc-start-logentry). (defun vc-finish-logentry (&optional nocomment) @@ -740,8 +739,6 @@ the buffer contents as a comment." (mapc (lambda (file) (vc-resynch-buffer file t t)) log-fileset)) - (when (vc-dispatcher-browsing) - (vc-dir-move-to-goal-column)) (run-hooks after-hook 'vc-finish-logentry-hook))) (defun vc-dispatcher-browsing () diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 5561292d8c0..f0a08044e28 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1346,8 +1346,6 @@ For old-style locking-based version control systems, like RCS: nil t))))) (vc-call-backend backend 'create-repo)) -(declare-function vc-dir-move-to-goal-column "vc-dir" ()) - ;;;###autoload (defun vc-register (&optional vc-fileset comment) "Register into a version control system. @@ -1398,8 +1396,6 @@ first backend that could register the file is used." (vc-resynch-buffer file t t)) files) - (when (derived-mode-p 'vc-dir-mode) - (vc-dir-move-to-goal-column)) (message "Registering %s... done" files))) (defun vc-register-with (backend) |