From unknown Sat Jun 21 10:46:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25570: 24.5; diff-hunk-kill: Show more clear error messages Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Jan 2017 11:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25570 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 25570@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.148568981817655 (code B ref -1); Sun, 29 Jan 2017 11:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jan 2017 11:36:58 +0000 Received: from localhost ([127.0.0.1]:49728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXnn0-0004ah-AJ for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXnmy-0004aU-Gv for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXnms-0007a0-6z for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:51 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39703) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cXnms-0007Zv-3C for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXnmq-0000Qm-Pm for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 06:36:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXnmn-0007Zb-Lv for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 06:36:48 -0500 Received: from mail-pg0-x22e.google.com ([2607:f8b0:400e:c05::22e]:35655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cXnmn-0007ZV-Fp for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 06:36:45 -0500 Received: by mail-pg0-x22e.google.com with SMTP id 194so93573288pgd.2 for ; Sun, 29 Jan 2017 03:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:subject:message-id:user-agent:mime-version; bh=IMgkvhCinGpZksFxw5bXp8jbGHtwhhZPBieKAF0TfUs=; b=ZKgBq8og5wFIcWcwnX7nWQkKHoGkhu2Xxl1sAMtZ/yxELIzzK4bTsjF7Hl4s89kPNX /kMfi1JBDsL387OLy8RBgEGwdc/2bAA+1eIwAN7lOT4IelEI+B7NUizSmVIUDZH4UgN5 HBIsoWVNjQC9lVmntuDcd24xcsIjZCpBY8flATt4tdSylUYO2AoTtsZ6H6fAOiJ6uS0d MNVsci4UnLXshGCd3DLx9PSmwdq+UEiS+VVrxcxdbfsBjJYWKixTmYjEWpseJPw3w/k/ A3pIa0sWNKJHWQpJhO9UkfZSssAkZM4PUmBG0n9D/rtxkD7bXxbgUzc8AXGF8uTSb3zI 5HuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:subject:message-id:user-agent :mime-version; bh=IMgkvhCinGpZksFxw5bXp8jbGHtwhhZPBieKAF0TfUs=; b=eJerTG1tVA3rGITPmuXOtF0AWI9GIASKAriK14dp5NUSOGdFIZxGxH5V+P/MopiTDv Hbjp7kOkEs0OPRF/8qDn30NZGxoAvSsB1xBpqnyiDpbODgCtzw4i9XcF9yayc5rpYhCd a8eZTp5TBVcy0HVhxKunCZ+rDT34qda26eDshPewsaUi0rzHEYSX5HK2ioTseAgrKAgo +bw7H05/edlDufTfMi/c25XTgDrp6h+zzVGV41S4yY/WfEJaAqBwVrrZ6RhzHRjdHPv5 H6L0oT4p2YKScU1r1nkQYvBODFTzdkriVjpW8DhbtctWGrYTdZWqO9QSOBeIRQ1iEcm0 aJYQ== X-Gm-Message-State: AIkVDXLtg27F51iDMwjrUNW988IXNDvxqj5KNtVDHis8O4fn1AKkbe8yYOXh6WPh88Ixug== X-Received: by 10.99.154.9 with SMTP id o9mr18689864pge.69.1485689804240; Sun, 29 Jan 2017 03:36:44 -0800 (PST) Received: from calancha-pc (33.94.100.220.dy.bbexcite.jp. [220.100.94.33]) by smtp.gmail.com with ESMTPSA id q22sm24313752pfj.77.2017.01.29.03.36.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Jan 2017 03:36:43 -0800 (PST) From: Tino Calancha X-Google-Original-From: Tino Calancha Date: Sun, 29 Jan 2017 20:36:41 +0900 (JST) X-X-Sender: calancha@calancha-pc Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) emacs -Q: ; Put following content in a buffer in diff-mode: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; START diff --git a/a b/a index 184cbf6..d2d9a24 100644 --- a/a +++ b/a @@ -1,2 +1,2 @@ -I have a foo in my bar. +I have a qux in my bar. Me too. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; END < ; Go to beginning of buffer M-k ; Signal error: Can't find the beginning of the file. M-K ; Same. M-n M-k ; Delete hunk OK, but it shows previous error in echo area. I propose the following patch: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 10af5a6466328acff37485364f8332a8043872e8 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Sun, 29 Jan 2017 20:17:09 +0900 Subject: [PATCH] Ignore error after kill last file or hunk * lisp/vc/diff-mode.el (diff-hunk-kill): Ignore error after kill last hunk. (diff-file-kill): Idem. Go to beginning of hunk before kill (Bug#25570). --- lisp/vc/diff-mode.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index e609ca9f94..3f3ade799b 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -668,7 +668,7 @@ diff-hunk-kill (inhibit-read-only t)) (apply 'kill-region bounds) (goto-char (car bounds)) - (diff-beginning-of-hunk t))) + (ignore-errors (diff-beginning-of-hunk t)))) (defun diff-beginning-of-file-and-junk () "Go to the beginning of file-related diff-info. @@ -720,9 +720,10 @@ diff-beginning-of-file-and-junk (defun diff-file-kill () "Kill current file's hunks." (interactive) + (diff-beginning-of-hunk t) (let ((inhibit-read-only t)) (apply 'kill-region (diff-bounds-of-file))) - (diff-beginning-of-hunk t)) + (ignore-errors (diff-beginning-of-hunk t))) (defun diff-kill-junk () "Kill spurious empty diffs." -- 2.11.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.6) of 2017-01-29 Repository revision: 0073223c23749ffd6bd3f882bc30a82cc37efd2a From unknown Sat Jun 21 10:46:17 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tino Calancha Subject: bug#25570: closed (Re: bug#25570: 24.5; diff-hunk-kill: Show more clear error messages) Message-ID: References: <87poj07m5f.fsf@calancha-pc> X-Gnu-PR-Message: they-closed 25570 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 25570@debbugs.gnu.org Date: Thu, 02 Feb 2017 13:34:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1486042443-17660-1" This is a multi-part message in MIME format... ------------=_1486042443-17660-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #25570: 24.5; diff-hunk-kill: Show more clear error messages which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25570@debbugs.gnu.org. --=20 25570: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25570 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1486042443-17660-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 25570-done) by debbugs.gnu.org; 2 Feb 2017 13:33:29 +0000 Received: from localhost ([127.0.0.1]:53838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZHVw-0004Zz-VS for submit@debbugs.gnu.org; Thu, 02 Feb 2017 08:33:29 -0500 Received: from mail-pg0-f51.google.com ([74.125.83.51]:33855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZHVv-0004Zm-2l for 25570-done@debbugs.gnu.org; Thu, 02 Feb 2017 08:33:27 -0500 Received: by mail-pg0-f51.google.com with SMTP id 14so5955278pgg.1 for <25570-done@debbugs.gnu.org>; Thu, 02 Feb 2017 05:33:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=4q7M3bsdFw5DjUT4S7cdt64HsXijW1Ioe9aoPRcouMI=; b=niVwar3iVrkWhURYsR7LLEXxjLIb5qUBt0Zs33UA25rTerZLP0Lr0wVmTObjEY2dQu AmcHxKfR0wNuN9/U/9o5RGNIP9xemTz8yixxsQztHoCJUPfsEThltME5UnlxgLfnRMwC 9rBbohIWhZc0gJ0RkLVnm34kVittPJtW3kcySLbJKAALr/qqFxBYblpN2Wq0YoismhAQ 2nHfXaq9dqItp8Zz25BBeCuMgDZ/Iz8mCHay1DnZm7uJqU9nZvqsSfKnFDXG+d3fV4MG sd6HJjrEc0fhCsuzJddcdEBziH7U8cSGNiq2QmghdqFhx1b+QKJU2zJXz1SSQaUsKuce 4daQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=4q7M3bsdFw5DjUT4S7cdt64HsXijW1Ioe9aoPRcouMI=; b=dp1dvZPiT82AC86VSikKoupg5w3Qj6FKQyIEwZ/8yErG3ONsGODg9k0tvi7DmTcPwQ 3QA+DWIYZRGmR5gfo8XFkk62Kt0wYI2v0iOUcrVNFrQPXjeTqD0y7oVquCOdXS8jvGpD km+rX/SdRO0LJbZH7iKYPNINCPPyYpqdeSgFWn1eL4shZgPOTwN4bYod/yCiCHcrXJwS ZZXuEV+IpAAbSC8IMGtomCj5E7VhS4LM1ABc8nSciITyCmle2Tceb389p0wAzcwEzmqL h5OB/hLvGdbYxwlVs6VBe+PXkWvhkt4cjQQd08+bsbrQkuDrnsgfGUjaJ5fUpc3b56gZ IJwQ== X-Gm-Message-State: AIkVDXJJYd/WboH++9HY2oV2w7Plsk6Wtl9EH6d0yt6W8rgkbs72PNgNTIo/DSsPegbpeA== X-Received: by 10.99.9.197 with SMTP id 188mr10726603pgj.121.1486042400816; Thu, 02 Feb 2017 05:33:20 -0800 (PST) Received: from calancha-pc (104.81.147.124.dy.bbexcite.jp. [124.147.81.104]) by smtp.gmail.com with ESMTPSA id r78sm58734954pfl.63.2017.02.02.05.33.19 for <25570-done@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Feb 2017 05:33:20 -0800 (PST) From: Tino Calancha To: 25570-done@debbugs.gnu.org Subject: Re: bug#25570: 24.5; diff-hunk-kill: Show more clear error messages References: Date: Thu, 02 Feb 2017 22:33:16 +0900 In-Reply-To: (Tino Calancha's message of "Sun, 29 Jan 2017 20:36:41 +0900 (JST)") Message-ID: <87poj07m5f.fsf@calancha-pc> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 25570-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Tino Calancha writes: > emacs -Q: > ; Put following content in a buffer in diff-mode: > ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; START > diff --git a/a b/a > index 184cbf6..d2d9a24 100644 > --- a/a > +++ b/a > @@ -1,2 +1,2 @@ > -I have a foo in my bar. > +I have a qux in my bar. > Me too. > ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; END > < ; Go to beginning of buffer > M-k ; Signal error: Can't find the beginning of the file. > M-K ; Same. > M-n M-k ; Delete hunk OK, but it shows previous error in echo area. Pushed fix to master branch as commit 01d87bf846b478dea0bfe824678e76089f5af2c7 ------------=_1486042443-17660-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Jan 2017 11:36:58 +0000 Received: from localhost ([127.0.0.1]:49728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXnn0-0004ah-AJ for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXnmy-0004aU-Gv for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXnms-0007a0-6z for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:51 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39703) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cXnms-0007Zv-3C for submit@debbugs.gnu.org; Sun, 29 Jan 2017 06:36:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXnmq-0000Qm-Pm for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 06:36:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXnmn-0007Zb-Lv for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 06:36:48 -0500 Received: from mail-pg0-x22e.google.com ([2607:f8b0:400e:c05::22e]:35655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cXnmn-0007ZV-Fp for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2017 06:36:45 -0500 Received: by mail-pg0-x22e.google.com with SMTP id 194so93573288pgd.2 for ; Sun, 29 Jan 2017 03:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:subject:message-id:user-agent:mime-version; bh=IMgkvhCinGpZksFxw5bXp8jbGHtwhhZPBieKAF0TfUs=; b=ZKgBq8og5wFIcWcwnX7nWQkKHoGkhu2Xxl1sAMtZ/yxELIzzK4bTsjF7Hl4s89kPNX /kMfi1JBDsL387OLy8RBgEGwdc/2bAA+1eIwAN7lOT4IelEI+B7NUizSmVIUDZH4UgN5 HBIsoWVNjQC9lVmntuDcd24xcsIjZCpBY8flATt4tdSylUYO2AoTtsZ6H6fAOiJ6uS0d MNVsci4UnLXshGCd3DLx9PSmwdq+UEiS+VVrxcxdbfsBjJYWKixTmYjEWpseJPw3w/k/ A3pIa0sWNKJHWQpJhO9UkfZSssAkZM4PUmBG0n9D/rtxkD7bXxbgUzc8AXGF8uTSb3zI 5HuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:subject:message-id:user-agent :mime-version; bh=IMgkvhCinGpZksFxw5bXp8jbGHtwhhZPBieKAF0TfUs=; b=eJerTG1tVA3rGITPmuXOtF0AWI9GIASKAriK14dp5NUSOGdFIZxGxH5V+P/MopiTDv Hbjp7kOkEs0OPRF/8qDn30NZGxoAvSsB1xBpqnyiDpbODgCtzw4i9XcF9yayc5rpYhCd a8eZTp5TBVcy0HVhxKunCZ+rDT34qda26eDshPewsaUi0rzHEYSX5HK2ioTseAgrKAgo +bw7H05/edlDufTfMi/c25XTgDrp6h+zzVGV41S4yY/WfEJaAqBwVrrZ6RhzHRjdHPv5 H6L0oT4p2YKScU1r1nkQYvBODFTzdkriVjpW8DhbtctWGrYTdZWqO9QSOBeIRQ1iEcm0 aJYQ== X-Gm-Message-State: AIkVDXLtg27F51iDMwjrUNW988IXNDvxqj5KNtVDHis8O4fn1AKkbe8yYOXh6WPh88Ixug== X-Received: by 10.99.154.9 with SMTP id o9mr18689864pge.69.1485689804240; Sun, 29 Jan 2017 03:36:44 -0800 (PST) Received: from calancha-pc (33.94.100.220.dy.bbexcite.jp. [220.100.94.33]) by smtp.gmail.com with ESMTPSA id q22sm24313752pfj.77.2017.01.29.03.36.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Jan 2017 03:36:43 -0800 (PST) From: Tino Calancha X-Google-Original-From: Tino Calancha Date: Sun, 29 Jan 2017 20:36:41 +0900 (JST) X-X-Sender: calancha@calancha-pc To: bug-gnu-emacs@gnu.org Subject: 24.5; diff-hunk-kill: Show more clear error messages Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) emacs -Q: ; Put following content in a buffer in diff-mode: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; START diff --git a/a b/a index 184cbf6..d2d9a24 100644 --- a/a +++ b/a @@ -1,2 +1,2 @@ -I have a foo in my bar. +I have a qux in my bar. Me too. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; END < ; Go to beginning of buffer M-k ; Signal error: Can't find the beginning of the file. M-K ; Same. M-n M-k ; Delete hunk OK, but it shows previous error in echo area. I propose the following patch: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 10af5a6466328acff37485364f8332a8043872e8 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Sun, 29 Jan 2017 20:17:09 +0900 Subject: [PATCH] Ignore error after kill last file or hunk * lisp/vc/diff-mode.el (diff-hunk-kill): Ignore error after kill last hunk. (diff-file-kill): Idem. Go to beginning of hunk before kill (Bug#25570). --- lisp/vc/diff-mode.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index e609ca9f94..3f3ade799b 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -668,7 +668,7 @@ diff-hunk-kill (inhibit-read-only t)) (apply 'kill-region bounds) (goto-char (car bounds)) - (diff-beginning-of-hunk t))) + (ignore-errors (diff-beginning-of-hunk t)))) (defun diff-beginning-of-file-and-junk () "Go to the beginning of file-related diff-info. @@ -720,9 +720,10 @@ diff-beginning-of-file-and-junk (defun diff-file-kill () "Kill current file's hunks." (interactive) + (diff-beginning-of-hunk t) (let ((inhibit-read-only t)) (apply 'kill-region (diff-bounds-of-file))) - (diff-beginning-of-hunk t)) + (ignore-errors (diff-beginning-of-hunk t))) (defun diff-kill-junk () "Kill spurious empty diffs." -- 2.11.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.6) of 2017-01-29 Repository revision: 0073223c23749ffd6bd3f882bc30a82cc37efd2a ------------=_1486042443-17660-1--