From: charles@aurox.ch (Charles A. Roelli)
To: Ivan Andrus <darthandrus@gmail.com>
Cc: 23679-done@debbugs.gnu.org
Subject: bug#23679: 25.0.94; vc-region-history does not work correctly when narrowed
Date: Wed, 20 Dec 2017 21:18:55 +0100 [thread overview]
Message-ID: <m2tvwlcfv4.fsf@aurox.ch> (raw)
In-Reply-To: <2DC550A0-0BEB-4BEB-88BD-F8C0F1606069@gmail.com> (message from Ivan Andrus on Wed, 1 Jun 2016 20:44:03 -0600)
> From: Ivan Andrus <darthandrus@gmail.com>
> Date: Wed, 1 Jun 2016 20:44:03 -0600
>
> 1. Emacs -Q
> 2. Open a file with git history, say something in the Emacs repository.
> 3. Narrow to a region not at the beginning of the file
> 4. Select a region
> 5. M-x vc-region-history
> 6. Notice that the history shown is for the beginning of the file
>
> This is because vc-region-history uses line-number-at-pos which returns
> the line number in the narrowed portion of the buffer.
>
> We could either put a save-restriction/widen pair in vc-region-history
> or create a function (say widened-line-number-at-pos or
> file-line-number-at-pos), which would be generally useful IMO.
> However, that would lead to two calles to save-restriction and widen
> instead of just one. Given the recent discussion on emacs-devel about
> widening for programs I felt I should get some feed back on the
> preferred method before pushing a fix.
>
> -Ivan
In the meantime, line-number-at-pos got an extra optional argument to
count from (point-min), so this should now be fixed:
branch: master
commit 9f1c613b07e4a745671af5818366660e3765984d
Fix vc-region-history when narrowed
* lisp/vc/vc.el (vc-region-history): Fix behavior when narrowed, by using
line numbers starting from (point-min).
---
lisp/vc/vc.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b159991..f48f682 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2417,8 +2417,8 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION."
(defun vc-region-history (from to)
"Show the history of the region FROM..TO."
(interactive "r")
- (let* ((lfrom (line-number-at-pos from))
- (lto (line-number-at-pos (1- to)))
+ (let* ((lfrom (line-number-at-pos from t))
+ (lto (line-number-at-pos (1- to) t))
(file buffer-file-name)
(backend (vc-backend file))
(buf (get-buffer-create "*VC-history*")))
(I forgot to mention the bug# in the commit, will hopefully remember
next time.)
prev parent reply other threads:[~2017-12-20 20:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 2:44 bug#23679: 25.0.94; vc-region-history does not work correctly when narrowed Ivan Andrus
2017-12-20 20:18 ` Charles A. Roelli [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2tvwlcfv4.fsf@aurox.ch \
--to=charles@aurox.ch \
--cc=23679-done@debbugs.gnu.org \
--cc=darthandrus@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.