aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2019-06-10 03:58:53 +0300
committerDmitry Gutov2019-06-10 03:58:53 +0300
commit0f67be92592ef82d971d004f4063e68682c123de (patch)
tree7bfa1df33165e44a6fe03b69031f9d67323a8e41
parent2a05c5dbd3eca91ef4b843d45f3e6868d28cdb33 (diff)
downloademacs-0f67be92592ef82d971d004f4063e68682c123de.tar.gz
emacs-0f67be92592ef82d971d004f4063e68682c123de.zip
; Revert "Publicize behavior of log-view-diff at beginning/end of active region"
This reverts commit 82db17d0d1231c4aa26e837f37428c44a67663ea. Undo the half-baked implementation of the new feature in Git log buffers until we can do it better (bug#35624).
-rw-r--r--doc/emacs/maintaining.texi11
-rw-r--r--lisp/vc/log-view.el14
-rw-r--r--lisp/vc/vc-git.el4
3 files changed, 2 insertions, 27 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 0fbf91ae613..4986c111030 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1033,7 +1033,6 @@ systems support modifying change comments.
1033Visit the revision indicated at the current line. 1033Visit the revision indicated at the current line.
1034 1034
1035@item d 1035@item d
1036@itemx =
1037Display a diff between the revision at point and the next earlier 1036Display a diff between the revision at point and the next earlier
1038revision, for the specific file. 1037revision, for the specific file.
1039 1038
@@ -1048,16 +1047,6 @@ L}), toggle between showing and hiding the full log entry for the
1048revision at point. 1047revision at point.
1049@end table 1048@end table
1050 1049
1051To compare two arbitrary revisions, activate the region: set the
1052beginning of the region to the line with the first revision and the
1053end of the region to the line with the second revision to compare,
1054then type @kbd{d} or @kbd{=}. When the beginning of the region is on
1055the top line that has no revision, it uses the current working revision
1056as the first revision to compare. When the end of the region is on
1057the bottom non-revision line after the last revision line, then it
1058uses the next earlier revision after the last displayed revision as
1059the second revision to compare.
1060
1061@vindex vc-log-show-limit 1050@vindex vc-log-show-limit
1062Because fetching many log entries can be slow, the 1051Because fetching many log entries can be slow, the
1063@file{*vc-change-log*} buffer displays no more than 2000 revisions by 1052@file{*vc-change-log*} buffer displays no more than 2000 revisions by
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 0b57e1d5086..3389264ce6e 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -585,13 +585,6 @@ point, get the diff between the revision at point and its
585previous revision. Otherwise, get the diff between the revisions 585previous revision. Otherwise, get the diff between the revisions
586where the region starts and ends. 586where the region starts and ends.
587 587
588When the beginning of the region is on the top line that has no revision,
589use the current working revision as the first revision to compare.
590
591When the end of the region is on the bottom non-revision line after
592the last revision line, use the previous revision of the last
593displayed revision as the second revision to compare.
594
595Unlike `log-view-diff-changeset', this function only shows the 588Unlike `log-view-diff-changeset', this function only shows the
596part of the changeset which affected the currently considered 589part of the changeset which affected the currently considered
597file(s)." 590file(s)."
@@ -607,13 +600,6 @@ point, get the diff between the revision at point and its
607previous revision. Otherwise, get the diff between the revisions 600previous revision. Otherwise, get the diff between the revisions
608where the region starts and ends. 601where the region starts and ends.
609 602
610When the beginning of the region is on the top line that has no revision,
611use the current working revision as the first revision to compare.
612
613When the end of the region is on the bottom non-revision line after
614the last revision line, use the previous revision of the last
615displayed revision as the second revision to compare.
616
617Unlike `log-view-diff' this function shows the whole changeset, 603Unlike `log-view-diff' this function shows the whole changeset,
618including changes affecting other files than the currently 604including changes affecting other files than the currently
619considered file(s)." 605considered file(s)."
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index b6feb3b8d1e..61c13026cc5 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1017,8 +1017,8 @@ If LIMIT is a revision string, use it as an end-revision."
1017 ;; If the buffer exists from a previous invocation it might be 1017 ;; If the buffer exists from a previous invocation it might be
1018 ;; read-only. 1018 ;; read-only.
1019 (let ((inhibit-read-only t)) 1019 (let ((inhibit-read-only t))
1020 (with-current-buffer buffer 1020 (with-current-buffer
1021 (insert "\n") 1021 buffer
1022 (apply 'vc-git-command buffer 1022 (apply 'vc-git-command buffer
1023 'async files 1023 'async files
1024 (append 1024 (append