From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#24556: 25.1.50; Undo partially broken in patch mode Date: Tue, 25 Jun 2019 02:15:51 +0200 Message-ID: References: <544bf69a-4bbf-c03b-c4fb-0432b6bd12fb@live.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="181913"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 24556@debbugs.gnu.org To: =?UTF-8?Q?Cl=C3=A9ment?= Pit--Claudel Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 25 02:16:12 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hfZ87-000lDC-7r for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jun 2019 02:16:11 +0200 Original-Received: from localhost ([::1]:55654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfZ85-00039u-Pu for geb-bug-gnu-emacs@m.gmane.org; Mon, 24 Jun 2019 20:16:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58548) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfZ7z-00039c-SS for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2019 20:16:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfZ7y-0003fo-Kw for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2019 20:16:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44863) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfZ7y-0003fX-HR for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2019 20:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfZ7y-0002KW-AB for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2019 20:16:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 25 Jun 2019 00:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24556 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 24556-submit@debbugs.gnu.org id=B24556.15614217578709 (code B ref 24556); Tue, 25 Jun 2019 00:16:02 +0000 Original-Received: (at 24556) by debbugs.gnu.org; 25 Jun 2019 00:15:57 +0000 Original-Received: from localhost ([127.0.0.1]:58407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfZ7t-0002G7-2z for submit@debbugs.gnu.org; Mon, 24 Jun 2019 20:15:57 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:39182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfZ7r-0002E0-At for 24556@debbugs.gnu.org; Mon, 24 Jun 2019 20:15:55 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=stories) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hfZ7n-0001A0-VE; Tue, 25 Jun 2019 02:15:54 +0200 In-Reply-To: <544bf69a-4bbf-c03b-c4fb-0432b6bd12fb@live.com> ("=?UTF-8?Q?Cl=C3=A9ment?= Pit--Claudel"'s message of "Wed, 28 Sep 2016 09:28:43 -0400") 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: 209.51.188.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:161317 Archived-At: Cl=C3=A9ment Pit--Claudel writes: > Recipe in emacs -Q: > > * Open a patch or diff file > * Press C-c C-d [diff-unified->context] > * Press C-_ [undo] > > Undo fails with the following backtrace: > > Debugger entered--Lisp error: (error "Changes to be undone by function di= fferent than announced") > signal(error ("Changes to be undone by function different than announce= d")) I can confirm that this is still the case. This code in diff-unified->context certainly looks like a likely culprit: (unless (or (not reversible) (eq buffer-undo-list t)) ;; Drop the many undo entries and replace them with ;; a single entry that uses diff-context->unified to do ;; the work. (setq buffer-undo-list (cons (list 'apply (- old-end end) start (point-max) 'diff-context->unified start (point-max)) old-undo))))))))))) --=20 (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no