From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alexei Khlebnikov Newsgroups: gmane.emacs.bugs Subject: bug#21559: 25.0.50; auto-revert-mode breaks git rebase Date: Wed, 21 Feb 2018 23:07:17 +0100 Message-ID: References: <5d7808ef-d61f-534d-53b3-bc1227b4c3b1@yandex.ru> <87fu5w2jnh.fsf@gmx.de> <40817863-9c34-9745-6fff-4357d623de20@yandex.ru> <87po4z512z.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="94eb2c1b656cb712640565c02782" X-Trace: blaine.gmane.org 1519250931 15597 195.159.176.226 (21 Feb 2018 22:08:51 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 21 Feb 2018 22:08:51 +0000 (UTC) Cc: Michael Albinus , Dmitry Gutov To: 21559@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Feb 21 23:08:46 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eocZ8-0003LI-Iv for geb-bug-gnu-emacs@m.gmane.org; Wed, 21 Feb 2018 23:08:42 +0100 Original-Received: from localhost ([::1]:34983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eocbA-0001Hr-O2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 21 Feb 2018 17:10:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eocZZ-00011B-LA for bug-gnu-emacs@gnu.org; Wed, 21 Feb 2018 17:10:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eocYV-0002IR-Cx for bug-gnu-emacs@gnu.org; Wed, 21 Feb 2018 17:09:09 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eocYU-0002Gd-OS for bug-gnu-emacs@gnu.org; Wed, 21 Feb 2018 17:08:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eocYU-0005fQ-7e for bug-gnu-emacs@gnu.org; Wed, 21 Feb 2018 17:08:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Alexei Khlebnikov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 21 Feb 2018 22:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21559 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21559-submit@debbugs.gnu.org id=B21559.151925086521741 (code B ref 21559); Wed, 21 Feb 2018 22:08:02 +0000 Original-Received: (at 21559) by debbugs.gnu.org; 21 Feb 2018 22:07:45 +0000 Original-Received: from localhost ([127.0.0.1]:54985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eocYD-0005eb-5W for submit@debbugs.gnu.org; Wed, 21 Feb 2018 17:07:45 -0500 Original-Received: from mail-wr0-f172.google.com ([209.85.128.172]:45506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eocYB-0005eO-Vd for 21559@debbugs.gnu.org; Wed, 21 Feb 2018 17:07:44 -0500 Original-Received: by mail-wr0-f172.google.com with SMTP id p104so8564624wrc.12 for <21559@debbugs.gnu.org>; Wed, 21 Feb 2018 14:07:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=EizS5jgch0ct9Ry3eyaZCcSlt/8j///6flqa5bR9E2g=; b=HY6nwdhuB38b1cqCKeIelpyPPFZrElS6qhLJyWCdYi35oe+lRj2aL9sDICI1xdIZy8 OWU6c+6Tsq+5ZL6mfMKhZiEyvZMQb+dwcmS7JbHC2ZYfyr7su8uQLzamfH0UDWFer+Gf LOIpV53YSe/xcAZiLVLIKl74D4lGI2HisTzLfqgYP7/uA8J3gb14woSIbIeaGz7utCGE XvEwe7g9JmqAkpFB0yQ01QxcjsqAqzXK/Ne4l7loXC7XO+oDk5MaijjB7aPEbvMGMFHg 9rQwpeCEeyFzXgq8zkGsrFxUsX2jU4im5MJqHOh6y0uFJDTPYXqWk+WBrYwhnCa3T7im imbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=EizS5jgch0ct9Ry3eyaZCcSlt/8j///6flqa5bR9E2g=; b=m3zpkI8wmriYldZfrkpwWfuG932/+iEBQbQ2dVxPsmnipYJS3AxHWo4jH++lIm5OM1 0OvZSgCQNfZ4eTp6GORrQ7CBBD6MvQ+RRFo4MN91re2uZy8qnSG70cPkt1GHEOtwFfcJ 9b2BZW+NRNRDCIgHj82k4Rv/oTJvWa340gBnv6Q2PXkmakUOgH7J5I2Fs8VLNUuBIvpu hzs5yvTDGLZMzyDlPoMZI9qxcQnnWy5NgW33Gy9gf3U/ykdLBvkuViZw7/k2qrr7Xisf NhEnp34dqrx4mWCuQMgl4bdTTzmQtF6TSAzP/uUqDoiDbr8t0v81hCoWD4WLweopBgUS TXmg== X-Gm-Message-State: APf1xPC+meSLZqlCjlUYZkWidnkX3KV+WjHlTCKYW7sI/atetsAzpWKG NX2IHCKhZ/peZyoUf2eace+/pAQ8qyRbYbSzce2AGQ== X-Google-Smtp-Source: AH8x225eS1agNYj/IWCmxoKf48yVtqXmbbTOJRWqRSIkiUoZIMnmQX0I+GwnpHzcNsyeVJr5Nm5D0x7xWNpOEFM9Ib8= X-Received: by 10.223.151.129 with SMTP id s1mr4353501wrb.206.1519250857966; Wed, 21 Feb 2018 14:07:37 -0800 (PST) Original-Received: by 10.28.229.138 with HTTP; Wed, 21 Feb 2018 14:07:17 -0800 (PST) In-Reply-To: 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: 208.118.235.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:143577 Archived-At: --94eb2c1b656cb712640565c02782 Content-Type: multipart/alternative; boundary="94eb2c1b656cb712600565c02780" --94eb2c1b656cb712600565c02780 Content-Type: text/plain; charset="UTF-8" Here is version 4 of the patch. "revert-buffer-in-progress-p" flag is set in "auto-revert-handler", according to Michael's idea and then checked in "vc-git-command", according to Dmitry's idea. I have tested the patch, it works. --94eb2c1b656cb712600565c02780 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Here is version 4 of the patch.

"revert-b= uffer-in-progress-p" flag is set in "auto-revert-handler", a= ccording to Michael's idea and then checked in "vc-git-command&quo= t;, according to Dmitry's idea.

I have tested the patch, i= t works.

--94eb2c1b656cb712600565c02780-- --94eb2c1b656cb712640565c02782 Content-Type: text/x-patch; charset="US-ASCII"; name="v4-0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebas.patch" Content-Disposition: attachment; filename="v4-0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebas.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jdxmfskw0 RnJvbSBkNmNmZmU5ZjdjYjBjNzgyN2ViNDdiMTNiOTIyMjkxNDE4ZWE4ZWJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4ZWkgS2hsZWJuaWtvdiA8YWxleGVpLmtobGVibmlrb3ZA Z21haWwuY29tPgpEYXRlOiBXZWQsIDIxIEZlYiAyMDE4IDIyOjM0OjIyICswMTAwClN1YmplY3Q6 IFtQQVRDSCB2NF0gRml4IGZvcjogIjI1LjAuNTA7IGF1dG8tcmV2ZXJ0LW1vZGUgYnJlYWtzIGdp dCByZWJhc2UiCiAoQnVnIzIxNTU5KQoKKiBsaXNwL2F1dG9yZXZlcnQuZWwgKGF1dG8tcmV2ZXJ0 LWhhbmRsZXIpOgogIFNldCAicmV2ZXJ0LWJ1ZmZlci1pbi1wcm9ncmVzcy1wIiBmbGFnCiAgYmVm b3JlIGNhbGxpbmcgInZjLXJlZnJlc2gtc3RhdGUiLgoKKiBsaXNwL3ZjL3ZjLWdpdC5lbCAodmMt Z2l0LWNvbW1hbmQpOgogIElmICJyZXZlcnQtYnVmZmVyLWluLXByb2dyZXNzLXAiIGZsYWcgaXMg c2V0LAogIHByZXBlbmQgIkdJVF9PUFRJT05BTF9MT0NLUz0wIiB0byAicHJvY2Vzcy1lbnZpcm9u bWVudCIuCi0tLQogbGlzcC9hdXRvcmV2ZXJ0LmVsIHwgMyArKy0KIGxpc3AvdmMvdmMtZ2l0LmVs ICB8IDkgKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9hdXRvcmV2ZXJ0LmVsIGIvbGlzcC9hdXRvcmV2 ZXJ0LmVsCmluZGV4IGNmMTQ1ZTBlZTMuLjBhOWQzYmVmNTQgMTAwNjQ0Ci0tLSBhL2xpc3AvYXV0 b3JldmVydC5lbAorKysgYi9saXNwL2F1dG9yZXZlcnQuZWwKQEAgLTcwOSw3ICs3MDksOCBAQCBh dXRvLXJldmVydC1oYW5kbGVyCiAgICAgOzsgYHByZXNlcnZlLW1vZGVzJyBhdm9pZHMgY2hhbmdp bmcgdGhlIChtaW5vcikgbW9kZXMuICBCdXQgd2UgZG8KICAgICA7OyB3YW50IHRvIHJlc2V0IHRo ZSBtb2RlIGZvciBWQywgc28gd2UgZG8gaXQgbWFudWFsbHkuCiAgICAgKHdoZW4gKG9yIHJldmVy dCBhdXRvLXJldmVydC1jaGVjay12Yy1pbmZvKQotICAgICAgKHZjLXJlZnJlc2gtc3RhdGUpKSkp CisgICAgICAobGV0ICgocmV2ZXJ0LWJ1ZmZlci1pbi1wcm9ncmVzcy1wIHQpKQorICAgICAgICAo dmMtcmVmcmVzaC1zdGF0ZSkpKSkpCiAKIChkZWZ1biBhdXRvLXJldmVydC10YWlsLWhhbmRsZXIg KHNpemUpCiAgIChsZXQgKChtb2RpZmllZCAoYnVmZmVyLW1vZGlmaWVkLXApKQpkaWZmIC0tZ2l0 IGEvbGlzcC92Yy92Yy1naXQuZWwgYi9saXNwL3ZjL3ZjLWdpdC5lbAppbmRleCA0NzE3MmRkNTJm Li5iMWE1N2FiNmY0IDEwMDY0NAotLS0gYS9saXNwL3ZjL3ZjLWdpdC5lbAorKysgYi9saXNwL3Zj L3ZjLWdpdC5lbApAQCAtMTU2Niw3ICsxNTY2LDE0IEBAIHZjLWdpdC1jb21tYW5kCiAgICAgICAg ICAob3IgY29kaW5nLXN5c3RlbS1mb3ItcmVhZCB2Yy1naXQtbG9nLW91dHB1dC1jb2Rpbmctc3lz dGVtKSkKIAkoY29kaW5nLXN5c3RlbS1mb3Itd3JpdGUKICAgICAgICAgIChvciBjb2Rpbmctc3lz dGVtLWZvci13cml0ZSB2Yy1naXQtY29tbWl0cy1jb2Rpbmctc3lzdGVtKSkKLSAgICAgICAgKHBy b2Nlc3MtZW52aXJvbm1lbnQgKGNvbnMgIkdJVF9ESVIiIHByb2Nlc3MtZW52aXJvbm1lbnQpKSkK KyAgICAgICAgKHByb2Nlc3MtZW52aXJvbm1lbnQKKyAgICAgICAgIChhcHBlbmQKKyAgICAgICAg ICBgKCJHSVRfRElSIgorICAgICAgICAgICAgOzsgQXZvaWQgcmVwb3NpdG9yeSBsb2NraW5nIGR1 cmluZyBiYWNrZ3JvdW5kIG9wZXJhdGlvbnMKKyAgICAgICAgICAgIDs7IChidWcjMjE1NTkpLgor ICAgICAgICAgICAgLEAod2hlbiByZXZlcnQtYnVmZmVyLWluLXByb2dyZXNzLXAKKyAgICAgICAg ICAgICAgICAnKCJHSVRfT1BUSU9OQUxfTE9DS1M9MCIpKSkKKyAgICAgICAgICBwcm9jZXNzLWVu dmlyb25tZW50KSkpCiAgICAgKGFwcGx5ICd2Yy1kby1jb21tYW5kIChvciBidWZmZXIgIip2Yyoi KSBva3N0YXR1cyB2Yy1naXQtcHJvZ3JhbQogCSAgIDs7IGh0dHBzOi8vZGViYnVncy5nbnUub3Jn LzE2ODk3CiAJICAgKHVubGVzcyAoYW5kIChub3QgKGNkci1zYWZlIGZpbGUtb3ItbGlzdCkpCi0t IAoyLjE1LjEKCg== --94eb2c1b656cb712640565c02782--