Received: (at 24556) by debbugs.gnu.org; 25 Jun 2019 00:15:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 24 20:15:57 2019
Received: from localhost ([127.0.0.1]:58407 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1hfZ7t-0002G7-2z
for submit <at> debbugs.gnu.org; Mon, 24 Jun 2019 20:15:57 -0400
Received: from quimby.gnus.org ([80.91.231.51]:39182)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <larsi@HIDDEN>) id 1hfZ7r-0002E0-At
for 24556 <at> debbugs.gnu.org; Mon, 24 Jun 2019 20:15:55 -0400
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 <larsi@HIDDEN>)
id 1hfZ7n-0001A0-VE; Tue, 25 Jun 2019 02:15:54 +0200
From: Lars Ingebrigtsen <larsi@HIDDEN>
To: =?utf-8?Q?Cl=C3=A9ment?= Pit--Claudel <clement.pitclaudel@HIDDEN>
Subject: Re: bug#24556: 25.1.50; Undo partially broken in patch mode
References: <544bf69a-4bbf-c03b-c4fb-0432b6bd12fb@HIDDEN>
Date: Tue, 25 Jun 2019 02:15:51 +0200
In-Reply-To: <544bf69a-4bbf-c03b-c4fb-0432b6bd12fb@HIDDEN>
(=?utf-8?Q?=22Cl=C3=A9ment?=
Pit--Claudel"'s message of "Wed, 28 Sep 2016 09:28:43 -0400")
Message-ID: <m3zhm6frk8.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
@@CONTACT_ADDRESS@@ for details.
Content preview: Clément Pit--Claudel <clement.pitclaudel@HIDDEN> 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: (err [...]
Content analysis details: (-2.9 points, 5.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP
-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
[score: 0.0000]
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 24556
Cc: 24556 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Cl=C3=A9ment Pit--Claudel <clement.pitclaudel@HIDDEN> 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
bug-gnu-emacs@HIDDEN:bug#24556; Package emacs.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 28 Sep 2016 13:29:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 28 09:29:13 2016
Received: from localhost ([127.0.0.1]:37695 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1bpEv7-0005TB-Cs
for submit <at> debbugs.gnu.org; Wed, 28 Sep 2016 09:29:12 -0400
Received: from eggs.gnu.org ([208.118.235.92]:47790)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <clement.pitclaudel@HIDDEN>) id 1bpEv2-0005SZ-IV
for submit <at> debbugs.gnu.org; Wed, 28 Sep 2016 09:29:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <clement.pitclaudel@HIDDEN>) id 1bpEuw-0004v8-GO
for submit <at> debbugs.gnu.org; Wed, 28 Sep 2016 09:28:59 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: *
X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_50,FREEMAIL_FROM,
RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.2
Received: from lists.gnu.org ([2001:4830:134:3::11]:36505)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <clement.pitclaudel@HIDDEN>) id 1bpEuw-0004v2-D1
for submit <at> debbugs.gnu.org; Wed, 28 Sep 2016 09:28:58 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38750)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <clement.pitclaudel@HIDDEN>) id 1bpEuu-00052W-4L
for bug-gnu-emacs@HIDDEN; Wed, 28 Sep 2016 09:28:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <clement.pitclaudel@HIDDEN>) id 1bpEuq-0004tL-Rh
for bug-gnu-emacs@HIDDEN; Wed, 28 Sep 2016 09:28:55 -0400
Received: from mout.kundenserver.de ([212.227.126.135]:57216)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <clement.pitclaudel@HIDDEN>) id 1bpEuq-0004t9-Hi
for bug-gnu-emacs@HIDDEN; Wed, 28 Sep 2016 09:28:52 -0400
Received: from [18.189.118.59] ([18.189.118.59]) by mrelayeu.kundenserver.de
(mreue005) with ESMTPSA (Nemesis) id 0Lu05i-1aq1GG3HeA-011Qgu for
<bug-gnu-emacs@HIDDEN>; Wed, 28 Sep 2016 15:28:51 +0200
To: bug-gnu-emacs@HIDDEN
From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= <clement.pitclaudel@HIDDEN>
Subject: 25.1.50; Undo partially broken in patch mode
Message-ID: <544bf69a-4bbf-c03b-c4fb-0432b6bd12fb@HIDDEN>
Date: Wed, 28 Sep 2016 09:28:43 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
Thunderbird/45.3.0
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature";
boundary="jJJnd06Lfl6o8Fqj3OSQ1jxnuapwm7awu"
X-Provags-ID: V03:K0:C7yi42W+BgSuJsSxjhr38IqaKNFl/OLk/T7Mi8V8QO1470+yqBl
BK3DKXdnBS8bve6Uj5wWqNsHFUlVgF+wfbR+oTwMrRCKBAi4a/j1/ksLpdVyGLWrPTRtxok
OoFZwHPBHuKlGNPdzUwTf7lIeBKXtffBihW6727ZPFKVTtO9675XXqShXNuKnwE49ag5Fr3
pHJfmsh6c7HgW6xv33Ndg==
X-UI-Out-Filterresults: notjunk:1;V01:K0:CfaL77f7RI0=:zwKlW3proyCwOKM/H7Mtis
/Qqh3cm8Gp93ZVMXjEBiJ6BBcb2ccRCyGLGSTK94aXQwlS5NDp+QuE8Q2FqS+ib12SlzOdHfO
flOK4AKPXVv17xhHGkBnQYU1MA6vVIE/IxjVkUTbDc86gl0ksc8i7VJVvB9RdhS28lc9hZpgW
aqIe66mxTvVsZZOIUt5wFrpNb/yXCSfUjcptE1V50THs2X7N4fAq46LY0CR9Swhrq37w+6ZdE
skvzO45eZSi0mAiimcOaUabzdX+ym4W3vf+ehSzZPaetPxC9keheEWKhzurxV9tilx0yCb6FN
D7brK02w9fpGBgzdP5Bu0w3fOSiF11KBWLU4TDd67r7O2ZI6HtDL2BJhqBGUV6YZVtDaqcWi6
4HOgUwzBa3Rjgf7zqaMYDZCftmgX93feMCNYbPajXTGLI2ShAIYWaqlwsR6tbxgFcRG3Jghjn
94qzKBklbbxrOWM160GwEQ9HN3eNDuiFD3Ie7df8Dz/k1P5yXy7B9tBY6aqsA91z5wyhX36fj
i0QlqdueYoBPBkaTYWqwKxKdiV65VT8sK45fHxriXLdlbSce9yq5N77blPD2eQ5D2nVwlvBqe
P4UEnHm09p9stSpTbQKkj2i7WpUM3BmNJMjmU2fiA8Vh15krj4734rXKkuKaXk3TUKDUusm97
D6p91uUnr9KO3oPMR/tUWfNyba5PnoBVHaAerS3Id0Fy1Lw/696FGHTmOJrkQi952ROk=
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: -3.5 (---)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.5 (---)
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--jJJnd06Lfl6o8Fqj3OSQ1jxnuapwm7awu
Content-Type: multipart/mixed; boundary="fAuNSRQwec0Crs4Lq2muaJjhig8iKsJPq";
protected-headers="v1"
From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= <clement.pitclaudel@HIDDEN>
To: bug-gnu-emacs@HIDDEN
Message-ID: <544bf69a-4bbf-c03b-c4fb-0432b6bd12fb@HIDDEN>
Subject: 25.1.50; Undo partially broken in patch mode
--fAuNSRQwec0Crs4Lq2muaJjhig8iKsJPq
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
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"))
error("Changes to be undone by function different than announced")
primitive-undo(1 ((apply -274 1289 9209 diff-context->unified 1289 9209=
) (apply -271 514 1289 diff-context->unified 514 1289) (#("---" 0 3 (font=
ified t face diff-header)) . 478) (481 . 484) (#("+++" 0 3 (fontified t f=
ace diff-header)) . 496) (t 22126 61486 433935 691000) (t 22126 61486 433=
935 691000) (499 . 502) (t 22126 61486 433935 691000)))
undo-more(1)
undo(nil)
funcall-interactively(undo nil)
call-interactively(undo nil nil)
command-execute(undo)
Cl=C3=A9ment.
In GNU Emacs 25.1.50.7 (x86_64-pc-linux-gnu, GTK+ Version 3.18.9)
of 2016-07-20 built on clem-w50-mint
Repository revision: a1a0c208e3e895a6ea0942e8e5c4077faf12c7ad
Windowing system distributor 'The X.Org Foundation', version 11.0.1180300=
0
System Description: Linux Mint 18 Sarah
--fAuNSRQwec0Crs4Lq2muaJjhig8iKsJPq--
--jJJnd06Lfl6o8Fqj3OSQ1jxnuapwm7awu
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
iQIcBAEBCAAGBQJX68WQAAoJEPqg+cTm90wjOxMP+wffpd0c1Nsg6Wtl7jyXyhTa
cfT8PaQCMnWTgIvZU3GTt3/KQwPpaiua+oqGezNlFbXxfnhh+YXx79NHHHBO3BWH
8ROMhrzgUnC2yC+UYDwL1wpFzvLAuT/rcGoJ8PER6bFx6VWS3Rao846nERQXhWjf
PMHxLAAw1CybPlReYrFMLE+HCLRnAnCp3dbT3gY0hG12/8nSRTWXX30Tvf/nXLNu
uM1KdW1oDMYyU86ac3b3pLmV0o/gbee74TQsrfjfdLevhML5Q9/oMI+RRZ6J03D0
ucPP3iyviyy2L2gbD1zpsP9Xpzlv4poSsLTUiSGpNQ3ADYw2IGtABM7p12RcbIYH
LnmVTFF7gf+tviZrwHk3l34DHxYzQeo18IQQg9jcqKCBND2yzHiGOdhOcVIxn5u7
D/JuhvyScNrMYmdZO0kqmAnlfDrLD0WmdS3GYPIis/pd0k7VPjJddabELtWuSZXA
Nx9umUtG9M15vokMecXzevAJJ6IeD5bw9sNTJrav3JahkA1AfXby8O54n9u11qDO
zX+HxNyemTe5QPobinqKigLAeCHXTJBd7nzQkzDAuPF2Tsp+mqV6Cp9RLuMBmZ9u
i1Wkw+ehSUJ9DiLv1pz4M/JlMY1uijtHcpWu3go9w3diQ9/WS274ZB3NtvklCkOd
E3Flw+YFEKYPX9kk7v/7
=nsMl
-----END PGP SIGNATURE-----
--jJJnd06Lfl6o8Fqj3OSQ1jxnuapwm7awu--
Clément Pit--Claudel <clement.pitclaudel@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#24556; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.