From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#33476: [PATCH] Fix occur revert with list-matching-lines-jump-to-current-line Date: Mon, 10 Dec 2018 01:54:14 +0200 Organization: LINKOV.NET Message-ID: <871s6qmf2x.fsf@mail.linkov.net> References: <874lc7sdok.fsf@konghq.com> <87efbagn6n.fsf@mail.linkov.net> <831s6s5q11.fsf@gnu.org> <87sgz74nj7.fsf@mail.linkov.net> <837egj3zja.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1544399650 31229 195.159.176.226 (9 Dec 2018 23:54:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 9 Dec 2018 23:54:10 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: 33476@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 10 00:54:06 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 1gW8tf-0007wX-TP for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Dec 2018 00:54:04 +0100 Original-Received: from localhost ([::1]:57249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gW8vm-0003uM-AW for geb-bug-gnu-emacs@m.gmane.org; Sun, 09 Dec 2018 18:56:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gW8vf-0003tx-TL for bug-gnu-emacs@gnu.org; Sun, 09 Dec 2018 18:56:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gW8va-0002Nf-RY for bug-gnu-emacs@gnu.org; Sun, 09 Dec 2018 18:56:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36137) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gW8va-0002NE-Mb for bug-gnu-emacs@gnu.org; Sun, 09 Dec 2018 18:56:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gW8va-0001Ye-Hm for bug-gnu-emacs@gnu.org; Sun, 09 Dec 2018 18:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 09 Dec 2018 23:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33476 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 33476-submit@debbugs.gnu.org id=B33476.15443997095927 (code B ref 33476); Sun, 09 Dec 2018 23:56:02 +0000 Original-Received: (at 33476) by debbugs.gnu.org; 9 Dec 2018 23:55:09 +0000 Original-Received: from localhost ([127.0.0.1]:40395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gW8uj-0001XX-Gz for submit@debbugs.gnu.org; Sun, 09 Dec 2018 18:55:09 -0500 Original-Received: from ladybird.maple.relay.mailchannels.net ([23.83.214.98]:8767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gW8uh-0001XM-E5 for 33476@debbugs.gnu.org; Sun, 09 Dec 2018 18:55:08 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 307C843A28; Sun, 9 Dec 2018 23:55:06 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a47.g.dreamhost.com (unknown [100.96.26.166]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id E6C91439C7; Sun, 9 Dec 2018 23:55:05 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a47.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Sun, 09 Dec 2018 23:55:06 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Average-Name: 4deb16f74cb25856_1544399706055_257758826 X-MC-Loop-Signature: 1544399706054:1246220202 X-MC-Ingress-Time: 1544399706054 Original-Received: from pdx1-sub0-mail-a47.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a47.g.dreamhost.com (Postfix) with ESMTP id 7FE4B8058E; Sun, 9 Dec 2018 15:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=qda4kRY6rID0ZGvDfb6syRMSERk=; b= ZtWQbvHozMTHEjjnn0TGV+agic0Cw2AOyJU4Eabp7XKX+JzZBstQA47iFyJbxtSe 7d7GGXpFENAblmxIoQoplenbsDLnXLvaIwpV3hY5KrE+/5bxYY8tk+sG9A0IEY9i u38FD/nt3BKeBQcwWrSHBUFELCCY0ixqEewBX/voq/k= Original-Received: from mail.jurta.org (m91-129-96-177.cust.tele2.ee [91.129.96.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a47.g.dreamhost.com (Postfix) with ESMTPSA id 123DD80590; Sun, 9 Dec 2018 15:55:03 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a47 In-Reply-To: <837egj3zja.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 09 Dec 2018 09:55:05 +0200") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedrudeggedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhofhffjgfkfgggtgesthdtredttdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucfkphepledurdduvdelrdeliedrudejjeenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrdeliedrudejjedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegvlhhiiiesghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedt 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:153280 Archived-At: >> I propose to install the patch from OP. This patch avoids the error. >> It still might behave incorrectly in some cases, but at least it >> doesn't raise the error. > > OK, please push that to emacs-26, and thanks. Done. The file admin/notes/repo instructs to use the phrase "Not to be merged to master" to indicate that it should not be merged to the master. But actually `gitmerge-skip-regexp' doesn't match this phrase: (string-match gitmerge-skip-regexp "; Not to be merged to master") nil Should admin/gitmerge.el be fixed to support this phrase before the next merge to master? >> >> But still I found a bug in master that can be fixed with another patch. >> >> The following patch is for Emacs 27: >> > >> > What is the bug you found in the master branch? >> >> In the master branch when `list-matching-lines-jump-to-current-line' >> is non-nil, it doesn't show the current line highlighted. > > Fine with me. Done.