From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#43297: 27.1; corrupts patch when diff-update-on-the-fly is set to nil Date: Fri, 16 Oct 2020 09:01:54 +0200 Message-ID: <87sgaeodr1.fsf@gnus.org> References: <87r1rag254.fsf@netris.org> <87y2k6oebn.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9870"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 43297@debbugs.gnu.org To: Mark H Weaver Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 16 09:03:11 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTJlf-0002TH-RR for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 16 Oct 2020 09:03:11 +0200 Original-Received: from localhost ([::1]:50138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTJle-0000Ox-Se for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 16 Oct 2020 03:03:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTJlW-0000Nr-4B for bug-gnu-emacs@gnu.org; Fri, 16 Oct 2020 03:03:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTJlV-00041t-QK for bug-gnu-emacs@gnu.org; Fri, 16 Oct 2020 03:03:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kTJlV-0007Zn-LE for bug-gnu-emacs@gnu.org; Fri, 16 Oct 2020 03:03:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 16 Oct 2020 07:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43297 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 43297-submit@debbugs.gnu.org id=B43297.160283172727567 (code B ref 43297); Fri, 16 Oct 2020 07:03:01 +0000 Original-Received: (at 43297) by debbugs.gnu.org; 16 Oct 2020 07:02:07 +0000 Original-Received: from localhost ([127.0.0.1]:57423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTJkc-0007AF-FA for submit@debbugs.gnu.org; Fri, 16 Oct 2020 03:02:06 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:51832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTJkb-00074B-1a for 43297@debbugs.gnu.org; Fri, 16 Oct 2020 03:02:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Oy/uFvNe589s8Si6K2TnpWU2c7Muj7dtzGBXlN6PdBc=; b=QljfPHkHSn6JuJdZkDoIbI5hm3 78JV2zKc99iApKdpzfVvvj6WLduRpPBZljCr4/yYjRN41mp1Ocw7olaZWCe8veDKjMVRtfIn09X+s A/38xKMpiR3Eo0r+oBKw2TirYZch8vQWSVcgDUNnYXqRrySG34XqchUZGYN+cpe5gCn0=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTJkR-0008EZ-RH; Fri, 16 Oct 2020 09:01:58 +0200 X-Now-Playing: The Human League's _Secrets_: "Sin City" In-Reply-To: <87y2k6oebn.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 16 Oct 2020 08:49:32 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:190657 Archived-At: Lars Ingebrigtsen writes: > An easier way to reproduce this bug is to just load the example patch > into a buffer and then eval-ing > > (diff-fixup-modifs (point-min) (point-max)) > > This shouldn't change the contents, but it does. Poking around in the code shows that it is indeed the signature that triggers the misbehaviour. It goes to the end of the buffer and then goes backward, line by line, and this is triggered: (pcase (char-after) (?\s (cl-incf space)) (?+ (cl-incf plus)) (?- (cl-incf minus)) Which makes it fix the line numbers in the hunk incorrectly. I'm not familiar with this code at all -- it seems to be written with the idea that there's just a patch in the current buffer, and nothing else. (At least at the end of the buffer.) And here's it's a patch in an email, so there's extra stuff. I don't see any obvious ways of fixing this... anybody got any ideas? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no