From 0f67be92592ef82d971d004f4063e68682c123de Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 10 Jun 2019 03:58:53 +0300 Subject: [PATCH] ; 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). --- doc/emacs/maintaining.texi | 11 ----------- lisp/vc/log-view.el | 14 -------------- 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. Visit the revision indicated at the current line. @item d -@itemx = Display a diff between the revision at point and the next earlier revision, for the specific file. @@ -1048,16 +1047,6 @@ L}), toggle between showing and hiding the full log entry for the revision at point. @end table -To compare two arbitrary revisions, activate the region: set the -beginning of the region to the line with the first revision and the -end of the region to the line with the second revision to compare, -then type @kbd{d} or @kbd{=}. When the beginning of the region is on -the top line that has no revision, it uses the current working revision -as the first revision to compare. When the end of the region is on -the bottom non-revision line after the last revision line, then it -uses the next earlier revision after the last displayed revision as -the second revision to compare. - @vindex vc-log-show-limit Because fetching many log entries can be slow, the @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 previous revision. Otherwise, get the diff between the revisions where the region starts and ends. -When the beginning of the region is on the top line that has no revision, -use the current working revision as the first revision to compare. - -When the end of the region is on the bottom non-revision line after -the last revision line, use the previous revision of the last -displayed revision as the second revision to compare. - Unlike `log-view-diff-changeset', this function only shows the part of the changeset which affected the currently considered file(s)." @@ -607,13 +600,6 @@ point, get the diff between the revision at point and its previous revision. Otherwise, get the diff between the revisions where the region starts and ends. -When the beginning of the region is on the top line that has no revision, -use the current working revision as the first revision to compare. - -When the end of the region is on the bottom non-revision line after -the last revision line, use the previous revision of the last -displayed revision as the second revision to compare. - Unlike `log-view-diff' this function shows the whole changeset, including changes affecting other files than the currently 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." ;; If the buffer exists from a previous invocation it might be ;; read-only. (let ((inhibit-read-only t)) - (with-current-buffer buffer - (insert "\n") + (with-current-buffer + buffer (apply 'vc-git-command buffer 'async files (append -- 2.39.2