From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: haj@posteo.de (Harald =?UTF-8?Q?J=C3=B6rg?=) Newsgroups: gmane.emacs.bugs Subject: bug#46574: cperl-mode: Improve detection of entries for imenu [PATCH] Date: Wed, 17 Feb 2021 00:48:08 +0100 Message-ID: <87tuqbefrb.fsf@hajtower> References: <871rdffwtr.fsf@hajtower> <877dn7r4y7.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34946"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Cc: 46574@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Feb 17 00:49:10 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lCA5e-0008x5-C6 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 17 Feb 2021 00:49:10 +0100 Original-Received: from localhost ([::1]:38772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCA5d-00017Z-5k for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 16 Feb 2021 18:49:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCA5W-00017A-9L for bug-gnu-emacs@gnu.org; Tue, 16 Feb 2021 18:49:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCA5V-0003Jc-M5 for bug-gnu-emacs@gnu.org; Tue, 16 Feb 2021 18:49:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lCA5V-0006Im-J5 for bug-gnu-emacs@gnu.org; Tue, 16 Feb 2021 18:49:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: haj@posteo.de (Harald =?UTF-8?Q?J=C3=B6rg?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 16 Feb 2021 23:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46574 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 46574-submit@debbugs.gnu.org id=B46574.161351929924173 (code B ref 46574); Tue, 16 Feb 2021 23:49:01 +0000 Original-Received: (at 46574) by debbugs.gnu.org; 16 Feb 2021 23:48:19 +0000 Original-Received: from localhost ([127.0.0.1]:41993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCA4o-0006Hp-Ut for submit@debbugs.gnu.org; Tue, 16 Feb 2021 18:48:19 -0500 Original-Received: from mout01.posteo.de ([185.67.36.65]:50569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCA4m-0006HX-6S for 46574@debbugs.gnu.org; Tue, 16 Feb 2021 18:48:18 -0500 Original-Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7CF5616005C for <46574@debbugs.gnu.org>; Wed, 17 Feb 2021 00:48:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1613519289; bh=YLmJ04YyBQ8dTLIrCbymjpE4uu/qlsrpLNeZ6voFQLI=; h=From:To:Cc:Subject:Date:From; b=H0FvLP5/OJZ7fXMhJyaKK9ZWBHNfalGrdlKgPYrX/IeogawENpXpovlWdEHE3ydjQ qJuLysuoN1M27uHP8LDODefenNUvcaCb6mD934X5qlJkga3neSBgCwI/fqb33pa+tk NkIWaUPLbV5eOsklNgz0AiykVB6OI2MNdCjWD1XU3U3lcY4BPOt3DnfNUHoKRT/i6d UwhlWdDxi64fKV0eyVKdig9QgSjFAbj7SM4K9/YsZSJKeJtWbfmVVCeRQovlNo9Acv ednXbOdZ2YmOgT8H5C4NPM/UEeb3++pLJZn4q0/YjzDw4P6knbrBkkhXd8wcdNaOFv wfH/eq0bvvQQQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DgHj44zVQz9rxH; Wed, 17 Feb 2021 00:48:08 +0100 (CET) In-Reply-To: <877dn7r4y7.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 17 Feb 2021 00:03:12 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:200175 Archived-At: Lars Ingebrigtsen writes: > haj@posteo.de (Harald J=C3=B6rg) writes: > >> This patch helps CPerl mode to detect various declarations which should >> go into the imenu index but were missed, and also prevents some false >> positives from being included. Undetected package declarations also led >> to wrong namespace attributions for subroutines declared within those >> packages. > > I've only skimmed the patch, but it makes sense to me. When applying > it, though, patch said: > > patching file lisp/progmodes/cperl-mode.el > Hunk #2 succeeded at 1210 (offset -41 lines). > Hunk #3 succeeded at 1367 (offset -41 lines). > Hunk #4 succeeded at 5286 (offset -41 lines). > Hunk #5 succeeded at 5368 (offset -41 lines). > Hunk #6 succeeded at 5403 (offset -41 lines). > Hunk #7 succeeded at 6734 (offset -41 lines). > > Which is odd. Could you check whether the patch is against the current > Emacs trunk? Ouch. I thought that my branch was up to date, but apparently Stefan Kangas has been active with CPerl mode while I was testing. I've reviewed Stefan's changes now. There is definitely no conflict and the patch can be applied regardless of the offset. The offset mainly came with 24a98755 (Feb 13), where Stefan eliminated a length of obsolete documentation. BTW: Stefan's cleanup work is great here. I've always wanted to start working on this but I am not confident enough. I don't know enough about the histories of (X)Emacs and CPerl-mode. --=20 Thanks for checking, haj