From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#24725: 25.1.50; vc-region-history may exceed max line number of file in repository Date: Tue, 18 Oct 2016 23:27:19 +0900 Message-ID: <87y41llol4.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1476801422 13527 195.159.176.226 (18 Oct 2016 14:37:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 18 Oct 2016 14:37:02 +0000 (UTC) To: 24725@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 18 16:36:58 2016 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 1bwVVY-0001zl-MN for geb-bug-gnu-emacs@m.gmane.org; Tue, 18 Oct 2016 16:36:48 +0200 Original-Received: from localhost ([::1]:41942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwVVa-0005n6-QC for geb-bug-gnu-emacs@m.gmane.org; Tue, 18 Oct 2016 10:36:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwVN9-0006Tc-O4 for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:28:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwVN4-0002TH-3G for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:28:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bwVN3-0002T8-UU for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:28:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bwVN3-0003Vi-Mg for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:28:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 Oct 2016 14:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 24725 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.147680086413466 (code B ref -1); Tue, 18 Oct 2016 14:28:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Oct 2016 14:27:44 +0000 Original-Received: from localhost ([127.0.0.1]:38218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwVMl-0003V8-VT for submit@debbugs.gnu.org; Tue, 18 Oct 2016 10:27:44 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwVMk-0003Uv-UF for submit@debbugs.gnu.org; Tue, 18 Oct 2016 10:27:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwVMe-0002MU-Sj for submit@debbugs.gnu.org; Tue, 18 Oct 2016 10:27:37 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:55799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwVMe-0002MQ-Q1 for submit@debbugs.gnu.org; Tue, 18 Oct 2016 10:27:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwVMd-000605-NM for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:27:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwVMZ-0002Kw-M2 for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:27:35 -0400 Original-Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36313) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bwVMZ-0002KL-FJ for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2016 10:27:31 -0400 Original-Received: by mail-pf0-x241.google.com with SMTP id r16so15299019pfg.3 for ; Tue, 18 Oct 2016 07:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version; bh=ZFexhvq+Rqous2Z4scjT8rhEIPf/WqgHd5hBhy0Oaok=; b=nyF3KH9N23Bwm/9E6DYdDgt+qCK9N+3gjIkML55s9L5TTt1hi1kczpjvSfXSwTusJG Z/UxmQl6LmFde85kOq/QncgK3TWMUCATqrEjAnvKvajVHTBr7XH5LARu2LriG6APC+8Z kgMhJqnztKHQ6aPJ4qVqU7reufprKpaSKpPoKS2EFzTjT3BI/XtjgNWm2TWahRKAfBJO uUF9xztYv65zvlneqBULfsk9EBxkRFfEQKvIUdZ/x5Gu6QnCEtQEHvWmBS+othBj2BP0 oTGfG5mWJmAkAB8RvKjefOPJ9wgOpnVEgLp615NEFqVMtE0zo/FRrRcrfs8aTM46eiTv 7s3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=ZFexhvq+Rqous2Z4scjT8rhEIPf/WqgHd5hBhy0Oaok=; b=XB+N6BA2qz33kf0/2JDQi8WeeG04n+ki/L8s66ctTdHgCBg9utxa5/I1p+JHmqFlZE zJAMh8lGEqGdix0j8Iee/42/Z+9yZ3dR7mQyvRlPbvZ1+uqpc80svlLW1+KqVJ645Y8+ Iu4zIeG3oWph4drYEkAXsFYVSWm4983APq/KMxnVh7ERgntSAkbc29IfVLFFaHdt0NI4 7hHshECAhy+BfycNuG6kYvMRyXEwXYorHNY9JcpRk2CIl6bg9q0lqlcX2Hf+0QecHVIa dJfz4LyDpQccvtzeDs3UFLjgdhEwU+XICwaPZXJX3QeXtajFWIh1ohFz1ptI2Jge0iLW siIw== X-Gm-Message-State: AA6/9RluePM/ke+OkgrN1IUOLOPUq5zB3SbjvavUF+72hhSNxThl/ahE/d54L6r4P+fMXw== X-Received: by 10.99.129.65 with SMTP id t62mr1005470pgd.114.1476800849675; Tue, 18 Oct 2016 07:27:29 -0700 (PDT) Original-Received: from calancha-pc (57.92.100.220.dy.bbexcite.jp. [220.100.92.57]) by smtp.gmail.com with ESMTPSA id ah5sm56715134pad.30.2016.10.18.07.27.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Oct 2016 07:27:29 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:124630 Archived-At: emacs -Q lisp/vc/vc.el C-x h M-x vc-region-history RET fatal: file vc.el has only 2921 lines ;; vc.el has 2922 lines but Git ignores the last empty line. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 12a6fc588fe60ebf98443a0fd068fe77d63bd17e Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Tue, 18 Oct 2016 23:20:07 +0900 Subject: [PATCH] vc-region-history: Do not exceed the file maximum line number The last empty line in a file is not part of the Git repository. * lisp/vc/vc.el (vc-region-history): Exclude the last empty line from the region (Bug#24724). --- lisp/vc/vc-git.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 9eac5b2..762f6af 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1016,6 +1016,8 @@ vc-git-region-history ;; FIXME: Maybe this should be done in vc.el (i.e. for all backends), but ;; since Git is the only backend to support this operation so far, it's hard ;; to tell. + (when (> lto (1- (line-number-at-pos (point-max)))) + (setq lto (1- (line-number-at-pos (point-max))))) (with-temp-buffer (vc-call-backend 'git 'diff file "HEAD" nil (current-buffer)) (goto-char (point-min)) -- 2.9.3 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 25.1.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.1) of 2016-10-13 built on calancha-pc Repository revision: baa8ba4ed471d7fe4bb07c80a9dd16c4712525b4