aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2019-05-13 23:40:11 +0300
committerJuri Linkov2019-05-13 23:40:11 +0300
commitcd5b0538c5ba1b4bb243897de0e1dbea3fad0637 (patch)
tree2c3b45d6482d149641ac245d08943fc93deea11f
parentf515bc6398141fea36b7a77453d5f114a59e55b3 (diff)
downloademacs-cd5b0538c5ba1b4bb243897de0e1dbea3fad0637.tar.gz
emacs-cd5b0538c5ba1b4bb243897de0e1dbea3fad0637.zip
* lisp/vc/log-view.el (log-view-diff-common): Use the previous revision
only when the end of the region is on a line after the last entry. (Bug#35624)
-rw-r--r--lisp/vc/log-view.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index e47fad89083..3389264ce6e 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -618,10 +618,11 @@ considered file(s)."
618 ;; When TO and FR are the same, or when point is on a line after 618 ;; When TO and FR are the same, or when point is on a line after
619 ;; the last entry, look at the previous revision. 619 ;; the last entry, look at the previous revision.
620 (when (or (string-equal fr to) 620 (when (or (string-equal fr to)
621 (>= (point) 621 (>= end
622 (save-excursion 622 (save-excursion
623 (goto-char (car fr-entry)) 623 (goto-char end)
624 (forward-line)))) 624 (log-view-end-of-defun)
625 (point))))
625 (setq fr (vc-call-backend log-view-vc-backend 'previous-revision nil fr))) 626 (setq fr (vc-call-backend log-view-vc-backend 'previous-revision nil fr)))
626 (vc-diff-internal 627 (vc-diff-internal
627 t (list log-view-vc-backend 628 t (list log-view-vc-backend