diff options
| author | Dmitry Gutov | 2019-06-10 03:58:53 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2019-06-10 03:58:53 +0300 |
| commit | 0f67be92592ef82d971d004f4063e68682c123de (patch) | |
| tree | 7bfa1df33165e44a6fe03b69031f9d67323a8e41 | |
| parent | 2a05c5dbd3eca91ef4b843d45f3e6868d28cdb33 (diff) | |
| download | emacs-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.texi | 11 | ||||
| -rw-r--r-- | lisp/vc/log-view.el | 14 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 4 |
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. | |||
| 1033 | Visit the revision indicated at the current line. | 1033 | Visit the revision indicated at the current line. |
| 1034 | 1034 | ||
| 1035 | @item d | 1035 | @item d |
| 1036 | @itemx = | ||
| 1037 | Display a diff between the revision at point and the next earlier | 1036 | Display a diff between the revision at point and the next earlier |
| 1038 | revision, for the specific file. | 1037 | revision, for the specific file. |
| 1039 | 1038 | ||
| @@ -1048,16 +1047,6 @@ L}), toggle between showing and hiding the full log entry for the | |||
| 1048 | revision at point. | 1047 | revision at point. |
| 1049 | @end table | 1048 | @end table |
| 1050 | 1049 | ||
| 1051 | To compare two arbitrary revisions, activate the region: set the | ||
| 1052 | beginning of the region to the line with the first revision and the | ||
| 1053 | end of the region to the line with the second revision to compare, | ||
| 1054 | then type @kbd{d} or @kbd{=}. When the beginning of the region is on | ||
| 1055 | the top line that has no revision, it uses the current working revision | ||
| 1056 | as the first revision to compare. When the end of the region is on | ||
| 1057 | the bottom non-revision line after the last revision line, then it | ||
| 1058 | uses the next earlier revision after the last displayed revision as | ||
| 1059 | the second revision to compare. | ||
| 1060 | |||
| 1061 | @vindex vc-log-show-limit | 1050 | @vindex vc-log-show-limit |
| 1062 | Because fetching many log entries can be slow, the | 1051 | Because 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 | |||
| 585 | previous revision. Otherwise, get the diff between the revisions | 585 | previous revision. Otherwise, get the diff between the revisions |
| 586 | where the region starts and ends. | 586 | where the region starts and ends. |
| 587 | 587 | ||
| 588 | When the beginning of the region is on the top line that has no revision, | ||
| 589 | use the current working revision as the first revision to compare. | ||
| 590 | |||
| 591 | When the end of the region is on the bottom non-revision line after | ||
| 592 | the last revision line, use the previous revision of the last | ||
| 593 | displayed revision as the second revision to compare. | ||
| 594 | |||
| 595 | Unlike `log-view-diff-changeset', this function only shows the | 588 | Unlike `log-view-diff-changeset', this function only shows the |
| 596 | part of the changeset which affected the currently considered | 589 | part of the changeset which affected the currently considered |
| 597 | file(s)." | 590 | file(s)." |
| @@ -607,13 +600,6 @@ point, get the diff between the revision at point and its | |||
| 607 | previous revision. Otherwise, get the diff between the revisions | 600 | previous revision. Otherwise, get the diff between the revisions |
| 608 | where the region starts and ends. | 601 | where the region starts and ends. |
| 609 | 602 | ||
| 610 | When the beginning of the region is on the top line that has no revision, | ||
| 611 | use the current working revision as the first revision to compare. | ||
| 612 | |||
| 613 | When the end of the region is on the bottom non-revision line after | ||
| 614 | the last revision line, use the previous revision of the last | ||
| 615 | displayed revision as the second revision to compare. | ||
| 616 | |||
| 617 | Unlike `log-view-diff' this function shows the whole changeset, | 603 | Unlike `log-view-diff' this function shows the whole changeset, |
| 618 | including changes affecting other files than the currently | 604 | including changes affecting other files than the currently |
| 619 | considered file(s)." | 605 | considered 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 |