From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#33476: [PATCH] Fix occur revert with list-matching-lines-jump-to-current-line Date: Mon, 10 Dec 2018 08:27:01 +0200 Message-ID: <83efap3nii.fsf@gnu.org> References: <874lc7sdok.fsf@konghq.com> <87efbagn6n.fsf@mail.linkov.net> <831s6s5q11.fsf@gnu.org> <87sgz74nj7.fsf@mail.linkov.net> <837egj3zja.fsf@gnu.org> <871s6qmf2x.fsf@mail.linkov.net> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1544423167 4156 195.159.176.226 (10 Dec 2018 06:26:07 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 10 Dec 2018 06:26:07 +0000 (UTC) Cc: 33476@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 10 07:26:03 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 1gWF10-0000vo-IM for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Dec 2018 07:26:02 +0100 Original-Received: from localhost ([::1]:59367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWF36-00050v-Bc for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Dec 2018 01:28:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWF2z-00050N-Sw for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2018 01:28:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWF2w-00061n-BY for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2018 01:28:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36390) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWF2w-0005ze-6T for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2018 01:28:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gWF2v-0005PZ-UD for bug-gnu-emacs@gnu.org; Mon, 10 Dec 2018 01:28:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Dec 2018 06:28:01 +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.154442324520752 (code B ref 33476); Mon, 10 Dec 2018 06:28:01 +0000 Original-Received: (at 33476) by debbugs.gnu.org; 10 Dec 2018 06:27:25 +0000 Original-Received: from localhost ([127.0.0.1]:40648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWF2K-0005Oe-Vm for submit@debbugs.gnu.org; Mon, 10 Dec 2018 01:27:25 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWF2I-0005OP-Qw for 33476@debbugs.gnu.org; Mon, 10 Dec 2018 01:27:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWF2A-0005cr-Dd for 33476@debbugs.gnu.org; Mon, 10 Dec 2018 01:27:17 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWF2A-0005cn-9p; Mon, 10 Dec 2018 01:27:14 -0500 Original-Received: from [176.228.60.248] (port=3701 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gWF29-0002lM-SG; Mon, 10 Dec 2018 01:27:14 -0500 In-reply-to: <871s6qmf2x.fsf@mail.linkov.net> (message from Juri Linkov on Mon, 10 Dec 2018 01:54:14 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:153292 Archived-At: > From: Juri Linkov > Cc: 33476@debbugs.gnu.org > Date: Mon, 10 Dec 2018 01:54:14 +0200 > > 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? Please don't use the instructions in admin/notes/repo, use the instructions in CONTRIBUTE instead. Personally, I'm not sure why the former exists, I'd be happy if we deleted it (and move any information that isn't already there to CONTRIBUTE). Thanks.