From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?Q?Mat=C4=9Bj?= Cepl Newsgroups: gmane.emacs.bugs Subject: bug#15303: 24.3; [diff-mode] diff-hunk-kill doesn't update numbers in subsequent hunks Date: Mon, 09 Sep 2013 20:26:06 +0200 Message-ID: <522E12BE.5020304@redhat.com> References: <87a9jo4d04.fsf@wycliff.ceplovi.cz> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="IA1KT0tl6MxDOwjRq1rq3IbUV4tSIhrkD" X-Trace: ger.gmane.org 1378751235 27921 80.91.229.3 (9 Sep 2013 18:27:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Sep 2013 18:27:15 +0000 (UTC) Cc: 15303@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 09 20:27:19 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VJ6BC-0005Vg-GR for geb-bug-gnu-emacs@m.gmane.org; Mon, 09 Sep 2013 20:27:18 +0200 Original-Received: from localhost ([::1]:53203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ6BC-0004KG-4T for geb-bug-gnu-emacs@m.gmane.org; Mon, 09 Sep 2013 14:27:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ6B1-0004Dq-7P for bug-gnu-emacs@gnu.org; Mon, 09 Sep 2013 14:27:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJ6Aw-00011Y-OQ for bug-gnu-emacs@gnu.org; Mon, 09 Sep 2013 14:27:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ6Aw-00011O-LR for bug-gnu-emacs@gnu.org; Mon, 09 Sep 2013 14:27:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VJ6Av-0003yb-Vo for bug-gnu-emacs@gnu.org; Mon, 09 Sep 2013 14:27:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Mat=C4=9Bj?= Cepl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 09 Sep 2013 18:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15303 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15303-submit@debbugs.gnu.org id=B15303.137875117415219 (code B ref 15303); Mon, 09 Sep 2013 18:27:01 +0000 Original-Received: (at 15303) by debbugs.gnu.org; 9 Sep 2013 18:26:14 +0000 Original-Received: from localhost ([127.0.0.1]:50845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VJ6AA-0003xO-A4 for submit@debbugs.gnu.org; Mon, 09 Sep 2013 14:26:14 -0400 Original-Received: from mx1.redhat.com ([209.132.183.28]:59319) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VJ6A7-0003x7-EJ for 15303@debbugs.gnu.org; Mon, 09 Sep 2013 14:26:12 -0400 Original-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r89IQ8Ch002938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Sep 2013 14:26:08 -0400 Original-Received: from wycliff.ceplovi.cz (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r89IQ7EE019692; Mon, 9 Sep 2013 14:26:08 -0400 Original-Received: from wycliff.ceplovi.cz (wycliff.ceplovi.cz [127.0.0.1]) by wycliff.ceplovi.cz (Postfix) with ESMTP id 32DFB40A38; Mon, 9 Sep 2013 20:26:07 +0200 (CEST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:25.0) Gecko/20100101 Thunderbird/25.0a2 In-Reply-To: X-Enigmail-Version: 1.5.2 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:78152 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --IA1KT0tl6MxDOwjRq1rq3IbUV4tSIhrkD Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 09/09/2013 08:18 PM, Stefan Monnier wrote: > I might accept a patch which fixes this issue, but doing it right > (e.g. handle all the different kinds of hunks we support, disregard > subsequent hunks that apply to other files, ...) might prove too comple= x > for the benefit. I am afraid, I have no clue about Lisp at all (SICP is still lying on my bed table, but I am afraid it is used mostly as sleeping pills ;)). I have come to this problem while writing my own module for vim (http://gitorious.org/vim-diff_navigator/). > The problem also is that this presumes a particular use case (you get > a diff for file FOO, then you remove some of the hunks to extract > a sub-diff that will apply to the same file). While working with Fedora (and RHEL) packages I work a lot with patches, and it is often much more easy to actually edit patches (which are of course correct ones) than to apply all patches and regenerate patches. And quilt doesn't help everytime completely. And of course, we have --fuzz=3D0 everywhere in Fedora (and RHEL). So, yes, I understand where you are coming from, but I have a bit different use case. > But there are other uses cases where the current behavior is "right". > E.g. I mainly use M-k in .rej files after I applied the corresponding > hunk by hand, in which case the subsequent hunks shouldn't be updated. > Admittedly, for a .rej file, the exact line numbers are often not quite= > right, so it wouldn't make things worse to update subsequent hunks. OTOH, my script in the worst case doesn't make things worse. Best, Mat=C4=9Bj --=20 http://www.ceplovi.cz/matej/, Jabber: mcepl@ceplovi.cz GPG Finger: 89EF 4BC6 288A BF43 1BAB 25C3 E09F EF25 D964 84AC Our lives are spectacles of powerlessness. -- Richard Rohr --IA1KT0tl6MxDOwjRq1rq3IbUV4tSIhrkD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iD8DBQFSLhK+4J/vJdlkhKwRArUEAJ0XU7h3BVwcw0i+XqWti/Wxydb8sACghLJ/ gZcPfT7EoCd2F4Ov6wRWajM= =ck/G -----END PGP SIGNATURE----- --IA1KT0tl6MxDOwjRq1rq3IbUV4tSIhrkD--