From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: charles@aurox.ch (Charles A. Roelli) Newsgroups: gmane.emacs.bugs Subject: bug#23679: 25.0.94; vc-region-history does not work correctly when narrowed Date: Wed, 20 Dec 2017 21:18:55 +0100 Message-ID: References: <2DC550A0-0BEB-4BEB-88BD-F8C0F1606069@gmail.com> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1513800869 15545 195.159.176.226 (20 Dec 2017 20:14:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 20 Dec 2017 20:14:29 +0000 (UTC) Cc: 23679-done@debbugs.gnu.org To: Ivan Andrus Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 20 21:14:24 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eRkky-0003cH-2e for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Dec 2017 21:14:24 +0100 Original-Received: from localhost ([::1]:39469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRkmu-0001Zc-Uu for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Dec 2017 15:16:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRkmi-0001Wz-70 for bug-gnu-emacs@gnu.org; Wed, 20 Dec 2017 15:16:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRkmd-0005Er-4m for bug-gnu-emacs@gnu.org; Wed, 20 Dec 2017 15:16:12 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRkmc-0005Ej-S4 for bug-gnu-emacs@gnu.org; Wed, 20 Dec 2017 15:16:07 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eRkma-0005le-Oy for bug-gnu-emacs@gnu.org; Wed, 20 Dec 2017 15:16:06 -0500 Resent-From: charles@aurox.ch (Charles A. Roelli) Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Wed, 20 Dec 2017 20:16:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 23679 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 23679@debbugs.gnu.org, charles@aurox.ch, darthandrus@gmail.com Original-Received: via spool by 23679-done@debbugs.gnu.org id=D23679.151380092522056 (code D ref 23679); Wed, 20 Dec 2017 20:16:04 +0000 Original-Received: (at 23679-done) by debbugs.gnu.org; 20 Dec 2017 20:15:25 +0000 Original-Received: from localhost ([127.0.0.1]:44789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eRklx-0005jb-81 for submit@debbugs.gnu.org; Wed, 20 Dec 2017 15:15:25 -0500 Original-Received: from sinyavsky.aurox.ch ([37.35.109.145]:37717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eRklt-0005j8-Dq for 23679-done@debbugs.gnu.org; Wed, 20 Dec 2017 15:15:22 -0500 Original-Received: from sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) by sinyavsky.aurox.ch (Postfix) with ESMTP id 888FC2260F for <23679-done@debbugs.gnu.org>; Wed, 20 Dec 2017 20:07:31 +0000 (UTC) Authentication-Results: sinyavsky.aurox.ch (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=aurox.ch DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aurox.ch; h= references:subject:subject:in-reply-to:to:from:from:message-id :date:date; s=dkim; t=1513800449; x=1514664450; bh=0gnW5hpNNXsvC ausm3kf6K3c//wXLR1/PqzsEeEaado=; b=T0paDcbgKeNVWAqb+xCHOPO416mEt 8tHrVeV1oAfcgBXSH1RbdaUBz9KAFGcaUqBpZ0thMO75Ls8jpQCyPQxTZbEqZyMw EK7aeuQG0iBRmYlq4MAicXZG94Jestep897s3N+l26PtCyN210foRbBhEjc063jg 9vqFGCW7XWtcrg= X-Virus-Scanned: Debian amavisd-new at test.virtualizor.com Original-Received: from sinyavsky.aurox.ch ([127.0.0.1]) by sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sVJoT-EILiwB for <23679-done@debbugs.gnu.org>; Wed, 20 Dec 2017 20:07:29 +0000 (UTC) Original-Received: from gray (125.85.192.178.dynamic.wline.res.cust.swisscom.ch [178.192.85.125]) by sinyavsky.aurox.ch (Postfix) with ESMTPSA id AF27622601; Wed, 20 Dec 2017 20:07:29 +0000 (UTC) In-reply-to: <2DC550A0-0BEB-4BEB-88BD-F8C0F1606069@gmail.com> (message from Ivan Andrus on Wed, 1 Jun 2016 20:44:03 -0600) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:141310 Archived-At: > From: Ivan Andrus > 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.)