From unknown Tue Sep 09 18:21:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32024: 27.0; [PATCH] `imenu--generic-function' Resent-From: Drew Adams Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 30 Jun 2018 22:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32024 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 32024@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.153039922127214 (code B ref -1); Sat, 30 Jun 2018 22:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jun 2018 22:53:41 +0000 Received: from localhost ([127.0.0.1]:41512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZOkP-00074s-Gn for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZOkN-00074e-VR for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZOkH-000568-Pq for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZOkH-00055l-KT for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZOkG-0001XQ-FS for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:53:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZOkD-00052W-C7 for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:53:32 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:48978) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZOkD-00051m-2L for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:53:29 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5UMrRnx159556 for ; Sat, 30 Jun 2018 22:53:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=mime-version : message-id : date : from : sender : to : subject : content-type; s=corp-2017-10-26; bh=OeDvTZOC3srmMPJ81BuiwBxKEF9fyMcNbQtu+Coe24Q=; b=h6+Eh9IwtyBvxaJG138wdGMuWwDIT7HY8WylvOpBwcsO1YISjlv9JQnVxB15UH8TFE3r c3Y0RxKFtnjqvb1JR2ZOhEWCs3tOgxVp+88UFtl+e61+UfzIMWThE70NzpSwJQyzYWg9 JPu9n61VCsHG1XdaKxB/5x2MQDtFk/D5cEngRvxKC+7mSkWeABcghXMEiU9F49mZjqRH GUPTM2HAyp+r8BD5YHdFqnuuEmGy4I5KB344OSXtpBprN7uFhs5L7hCRtynfz18hn2uh dP9f3SKqwBsH2f1vLf1/Q5rYrL8vBGQKvG/eaTLEgoft2bcwXs3IxeKmLrpzRj5gi5XR dg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2jx1tns4h1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 30 Jun 2018 22:53:27 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w5UMrQNO017484 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 30 Jun 2018 22:53:26 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w5UMrPj7013071 for ; Sat, 30 Jun 2018 22:53:26 GMT MIME-Version: 1.0 Message-ID: Date: Sat, 30 Jun 2018 15:53:22 -0700 (PDT) From: Drew Adams X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.9.1 (1003210) [OL 16.0.4705.0 (x86)] Content-Type: multipart/mixed; boundary="__1530399205472323361abhmp0004.oracle.com" X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8940 signatures=668704 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1806300270 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --__1530399205472323361abhmp0004.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Attached is a patch for two bugs in `imenu--generic-function'. I ran into them when using a function value for argument REGEXP, though neither has to do particularly with that use case. Instead, they both have to do with the case where items are within comments or strings, which might be skipped. 1. When checking whether the current item is inside a comment or string, it's necessary to first move point to position START. Otherwise, the test is made at bol (which might not be within a comment or string, even though the START position is). 2. At the end, it's necessary to remove any empty menus that could have been added. That can happen because of skipping things inside comments or strings. In GNU Emacs 27.0.50 (build 3, x86_64-w64-mingw32) of 2018-03-21 Repository revision: e70d0c9e66d7a8609450b2889869d16aeb0363b5 Windowing system distributor `Microsoft Corp.', version 6.1.7601 Configured using: `configure --without-dbus --host=3Dx86_64-w64-mingw32 --without-compress-install -C 'CFLAGS=3D-O2 -static -g3'' --__1530399205472323361abhmp0004.oracle.com Content-Type: application/octet-stream; name="imenu-2018-06-30.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="imenu-2018-06-30.patch" ZGlmZiAtdSBpbWVudS5lbCBpbWVudS0yMDE4LTA2LTMwLXBhdGNoZWQuZWwKLS0tIGltZW51LmVs CTIwMTgtMDYtMzAgMTU6MzQ6NDYuNjE0NjUzNjAwIC0wNzAwCisrKyBpbWVudS0yMDE4LTA2LTMw LXBhdGNoZWQuZWwJMjAxOC0wNi0zMCAxNTo0NDoxNy45NDY3OTEwMDAgLTA3MDAKQEAgLTgxNyw3 ICs4MTcsNyBAQAogCQkgIDs7IEluc2VydCB0aGUgaXRlbSB1bmxlc3MgaXQgaXMgYWxyZWFkeSBw cmVzZW50LgogCQkgICh1bmxlc3MgKG9yIChtZW1iZXIgaXRlbSAoY2RyIG1lbnUpKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGFuZCBpbWVudS1nZW5lcmljLXNraXAtY29tbWVudHMt YW5kLXN0cmluZ3MKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG50aCA4IChz eW50YXgtcHBzcykpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNhdmUt ZXhjdXJzaW9uIChnb3RvLWNoYXIgc3RhcnQpIChudGggOCAoc3ludGF4LXBwc3MpKSkpKQogCQkg ICAgKHNldGNkciBtZW51CiAJCQkgICAgKGNvbnMgaXRlbSAoY2RyIG1lbnUpKSkpKQogCQk7OyBH byB0byB0aGUgc3RhcnQgb2YgdGhlIG1hdGNoLCB0byBtYWtlIHN1cmUgd2UKQEAgLTgzMSw3ICs4 MzEsMTAgQEAKIAkoc2V0Y2RyIGl0ZW0gKHNvcnQgKGNkciBpdGVtKSAnaW1lbnUtLXNvcnQtYnkt cG9zaXRpb24pKSkpCiAgICAgKGxldCAoKG1haW4tZWxlbWVudCAoYXNzcSBuaWwgaW5kZXgtYWxp c3QpKSkKICAgICAgIChuY29uYyAoZGVscSBtYWluLWVsZW1lbnQgKGRlbHEgJ2R1bW15IGluZGV4 LWFsaXN0KSkKLQkgICAgIChjZHIgbWFpbi1lbGVtZW50KSkpKSkKKyAgICAgICAgICAgICAoY2Ry IG1haW4tZWxlbWVudCkpKQorICAgIDs7IFJlbW92ZSBhbnkgZW1wdHkgbWVudXMuICBUaGF0IGNh biBoYXBwZW4gYmVjYXVzZSBvZiBza2lwcGluZyB0aGluZ3MgaW5zaWRlIGNvbW1lbnRzIG9yIHN0 cmluZ3MuCisgICAgKHdoZW4gKGNvbnNwIChjYXIgaW5kZXgtYWxpc3QpKQorICAgICAgKHNldHEg aW5kZXgtYWxpc3QgIChpbWVudXAtZGVsZXRlLWlmLW5vdCAobGFtYmRhIChpdCkgKGNkciBpdCkp IGluZGV4LWFsaXN0KSkpKSkKIAogOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OwogOzs7Cg== --__1530399205472323361abhmp0004.oracle.com-- From unknown Tue Sep 09 18:21:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32024: 27.0; [PATCH] `imenu--generic-function' Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 07 Jul 2018 09:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32024 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Drew Adams Cc: 32024@debbugs.gnu.org Received: via spool by 32024-submit@debbugs.gnu.org id=B32024.153095511716933 (code B ref 32024); Sat, 07 Jul 2018 09:19:01 +0000 Received: (at 32024) by debbugs.gnu.org; 7 Jul 2018 09:18:37 +0000 Received: from localhost ([127.0.0.1]:49094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbjMT-0004P3-7D for submit@debbugs.gnu.org; Sat, 07 Jul 2018 05:18:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbjMQ-0004Oq-Og for 32024@debbugs.gnu.org; Sat, 07 Jul 2018 05:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbjMI-0007Sb-Hc for 32024@debbugs.gnu.org; Sat, 07 Jul 2018 05:18:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbjMI-0007SU-EF; Sat, 07 Jul 2018 05:18:26 -0400 Received: from [176.228.60.248] (port=4573 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fbjMH-0003lM-PF; Sat, 07 Jul 2018 05:18:26 -0400 Date: Sat, 07 Jul 2018 12:18:29 +0300 Message-Id: <83efgfjtei.fsf@gnu.org> From: Eli Zaretskii In-reply-to: (message from Drew Adams on Sat, 30 Jun 2018 15:53:22 -0700 (PDT)) References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) > Date: Sat, 30 Jun 2018 15:53:22 -0700 (PDT) > From: Drew Adams > > Attached is a patch for two bugs in `imenu--generic-function'. I ran > into them when using a function value for argument REGEXP, though > neither has to do particularly with that use case. Instead, they both > have to do with the case where items are within comments or strings, > which might be skipped. > > 1. When checking whether the current item is inside a comment or string, > it's necessary to first move point to position START. Otherwise, the > test is made at bol (which might not be within a comment or string, > even though the START position is). > > 2. At the end, it's necessary to remove any empty menus that could have > been added. That can happen because of skipping things inside > comments or strings. Thanks. Applying this produces the following warning from the byte compiler: In end of data: imenu.el:1056:1:Warning: the function `imenup-delete-if-not' is not known to be defined. And indeed, I cannot find that function anywhere in Emacs. From unknown Tue Sep 09 18:21:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#32024: 27.0; [PATCH] `imenu--generic-function' Resent-From: Drew Adams Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 07 Jul 2018 14:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32024 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii , Drew Adams Cc: 32024@debbugs.gnu.org Received: via spool by 32024-submit@debbugs.gnu.org id=B32024.153097368321216 (code B ref 32024); Sat, 07 Jul 2018 14:29:02 +0000 Received: (at 32024) by debbugs.gnu.org; 7 Jul 2018 14:28:03 +0000 Received: from localhost ([127.0.0.1]:50238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fboBv-0005W8-04 for submit@debbugs.gnu.org; Sat, 07 Jul 2018 10:28:03 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:33006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fboBt-0005Ve-9N for 32024@debbugs.gnu.org; Sat, 07 Jul 2018 10:28:01 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w67EOnWX137858; Sat, 7 Jul 2018 14:27:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=mime-version : message-id : date : from : sender : to : cc : subject : references : in-reply-to : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=w1U7XO8B1ihqW/7GJCxN3CRYxouIvMn0qufLjTLmoPc=; b=fvcJt5OXoK1fF0e2oXrGZMzwcB/yii8Ta5fiSxjghjzk8eVPGrtxbWl3vVEPsu7EvAvk YxPnKh2dxwtBi7pL6+pvz9e+aoFKI2zA171aG7xrsWj7amcz3S+EbgKU3UtaXnv9WMka Fvg+GS46hBmnePeMBF3DzlRd0Dd8uFFIgYbssG+IXV59riqI2rLgU/jk/m/UXKJUoHPO cqwTdFwOZrBzsNRQ/Spcdi6SHplrWrpdoviNad8+37lX/W51EwCStV5JQZLXIRO4BY7A MlvwsUQ2rdt3OftEogBFRmwfVbSsxwDeRHUtonWSaFXQImukN9f28pif/Ljl7JA9s9jz Hw== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2k2p7v0ny1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 07 Jul 2018 14:27:55 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w67ERrcl021867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 7 Jul 2018 14:27:54 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w67ERq2h014064; Sat, 7 Jul 2018 14:27:53 GMT MIME-Version: 1.0 Message-ID: <1bfe434a-59b8-4923-ac8a-536189252d25@default> Date: Sat, 7 Jul 2018 07:27:52 -0700 (PDT) From: Drew Adams References: <> <<83efgfjtei.fsf@gnu.org>> In-Reply-To: <<83efgfjtei.fsf@gnu.org>> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.9.1 (1003210) [OL 16.0.4705.0 (x86)] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8946 signatures=668704 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807070173 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > > Attached is a patch for two bugs in `imenu--generic-function'. I ran > > into them when using a function value for argument REGEXP, though > > neither has to do particularly with that use case. Instead, they both > > have to do with the case where items are within comments or strings, > > which might be skipped. > > > > 1. When checking whether the current item is inside a comment or > string, > > it's necessary to first move point to position START. Otherwise, > the > > test is made at bol (which might not be within a comment or string, > > even though the START position is). > > > > 2. At the end, it's necessary to remove any empty menus that could have > > been added. That can happen because of skipping things inside > > comments or strings. >=20 > Thanks. >=20 > Applying this produces the following warning from the byte compiler: >=20 > In end of data: > imenu.el:1056:1:Warning: the function `imenup-delete-if-not' is not > known to be defined. >=20 > And indeed, I cannot find that function anywhere in Emacs. Sorry about that. Can you please substitute the equivalent function from Emacs, `cl-delete-if-not' (in `cl-seq.el')? (I took this from my `imenu+.el' code, and that library does not want to load `cl-seq.el' just for this, so it defines the function separately.) From unknown Tue Sep 09 18:21:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Drew Adams Subject: bug#32024: closed (Re: bug#32024: 27.0; [PATCH] `imenu--generic-function') Message-ID: References: <83muv3hv7q.fsf@gnu.org> X-Gnu-PR-Message: they-closed 32024 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 32024@debbugs.gnu.org Date: Sat, 07 Jul 2018 16:23:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1530980582-32378-1" This is a multi-part message in MIME format... ------------=_1530980582-32378-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32024: 27.0; [PATCH] `imenu--generic-function' which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32024@debbugs.gnu.org. --=20 32024: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32024 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1530980582-32378-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32024-done) by debbugs.gnu.org; 7 Jul 2018 16:22:24 +0000 Received: from localhost ([127.0.0.1]:50346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbpya-0008P9-5B for submit@debbugs.gnu.org; Sat, 07 Jul 2018 12:22:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbpyY-0008Ow-2a for 32024-done@debbugs.gnu.org; Sat, 07 Jul 2018 12:22:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbpyP-00025C-8W for 32024-done@debbugs.gnu.org; Sat, 07 Jul 2018 12:22:16 -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.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbpyP-000254-4V; Sat, 07 Jul 2018 12:22:13 -0400 Received: from [176.228.60.248] (port=3493 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fbpyO-000890-Hd; Sat, 07 Jul 2018 12:22:12 -0400 Date: Sat, 07 Jul 2018 19:22:17 +0300 Message-Id: <83muv3hv7q.fsf@gnu.org> From: Eli Zaretskii To: Drew Adams In-reply-to: <1bfe434a-59b8-4923-ac8a-536189252d25@default> (message from Drew Adams on Sat, 7 Jul 2018 07:27:52 -0700 (PDT)) Subject: Re: bug#32024: 27.0; [PATCH] `imenu--generic-function' References: <> <<83efgfjtei.fsf@gnu.org>> <1bfe434a-59b8-4923-ac8a-536189252d25@default> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32024-done Cc: 32024-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) > Date: Sat, 7 Jul 2018 07:27:52 -0700 (PDT) > From: Drew Adams > Cc: 32024@debbugs.gnu.org > > Sorry about that. Can you please substitute the equivalent > function from Emacs, `cl-delete-if-not' (in `cl-seq.el')? Done, thanks. ------------=_1530980582-32378-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Jun 2018 22:53:41 +0000 Received: from localhost ([127.0.0.1]:41512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZOkP-00074s-Gn for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fZOkN-00074e-VR for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZOkH-000568-Pq for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZOkH-00055l-KT for submit@debbugs.gnu.org; Sat, 30 Jun 2018 18:53:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZOkG-0001XQ-FS for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:53:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZOkD-00052W-C7 for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:53:32 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:48978) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fZOkD-00051m-2L for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:53:29 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5UMrRnx159556 for ; Sat, 30 Jun 2018 22:53:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=mime-version : message-id : date : from : sender : to : subject : content-type; s=corp-2017-10-26; bh=OeDvTZOC3srmMPJ81BuiwBxKEF9fyMcNbQtu+Coe24Q=; b=h6+Eh9IwtyBvxaJG138wdGMuWwDIT7HY8WylvOpBwcsO1YISjlv9JQnVxB15UH8TFE3r c3Y0RxKFtnjqvb1JR2ZOhEWCs3tOgxVp+88UFtl+e61+UfzIMWThE70NzpSwJQyzYWg9 JPu9n61VCsHG1XdaKxB/5x2MQDtFk/D5cEngRvxKC+7mSkWeABcghXMEiU9F49mZjqRH GUPTM2HAyp+r8BD5YHdFqnuuEmGy4I5KB344OSXtpBprN7uFhs5L7hCRtynfz18hn2uh dP9f3SKqwBsH2f1vLf1/Q5rYrL8vBGQKvG/eaTLEgoft2bcwXs3IxeKmLrpzRj5gi5XR dg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2jx1tns4h1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 30 Jun 2018 22:53:27 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w5UMrQNO017484 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 30 Jun 2018 22:53:26 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w5UMrPj7013071 for ; Sat, 30 Jun 2018 22:53:26 GMT MIME-Version: 1.0 Message-ID: Date: Sat, 30 Jun 2018 15:53:22 -0700 (PDT) From: Drew Adams To: bug-gnu-emacs@gnu.org Subject: 27.0; [PATCH] `imenu--generic-function' X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.9.1 (1003210) [OL 16.0.4705.0 (x86)] Content-Type: multipart/mixed; boundary="__1530399205472323361abhmp0004.oracle.com" X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8940 signatures=668704 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1806300270 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --__1530399205472323361abhmp0004.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Attached is a patch for two bugs in `imenu--generic-function'. I ran into them when using a function value for argument REGEXP, though neither has to do particularly with that use case. Instead, they both have to do with the case where items are within comments or strings, which might be skipped. 1. When checking whether the current item is inside a comment or string, it's necessary to first move point to position START. Otherwise, the test is made at bol (which might not be within a comment or string, even though the START position is). 2. At the end, it's necessary to remove any empty menus that could have been added. That can happen because of skipping things inside comments or strings. In GNU Emacs 27.0.50 (build 3, x86_64-w64-mingw32) of 2018-03-21 Repository revision: e70d0c9e66d7a8609450b2889869d16aeb0363b5 Windowing system distributor `Microsoft Corp.', version 6.1.7601 Configured using: `configure --without-dbus --host=3Dx86_64-w64-mingw32 --without-compress-install -C 'CFLAGS=3D-O2 -static -g3'' --__1530399205472323361abhmp0004.oracle.com Content-Type: application/octet-stream; name="imenu-2018-06-30.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="imenu-2018-06-30.patch" ZGlmZiAtdSBpbWVudS5lbCBpbWVudS0yMDE4LTA2LTMwLXBhdGNoZWQuZWwKLS0tIGltZW51LmVs CTIwMTgtMDYtMzAgMTU6MzQ6NDYuNjE0NjUzNjAwIC0wNzAwCisrKyBpbWVudS0yMDE4LTA2LTMw LXBhdGNoZWQuZWwJMjAxOC0wNi0zMCAxNTo0NDoxNy45NDY3OTEwMDAgLTA3MDAKQEAgLTgxNyw3 ICs4MTcsNyBAQAogCQkgIDs7IEluc2VydCB0aGUgaXRlbSB1bmxlc3MgaXQgaXMgYWxyZWFkeSBw cmVzZW50LgogCQkgICh1bmxlc3MgKG9yIChtZW1iZXIgaXRlbSAoY2RyIG1lbnUpKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGFuZCBpbWVudS1nZW5lcmljLXNraXAtY29tbWVudHMt YW5kLXN0cmluZ3MKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG50aCA4IChz eW50YXgtcHBzcykpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNhdmUt ZXhjdXJzaW9uIChnb3RvLWNoYXIgc3RhcnQpIChudGggOCAoc3ludGF4LXBwc3MpKSkpKQogCQkg ICAgKHNldGNkciBtZW51CiAJCQkgICAgKGNvbnMgaXRlbSAoY2RyIG1lbnUpKSkpKQogCQk7OyBH byB0byB0aGUgc3RhcnQgb2YgdGhlIG1hdGNoLCB0byBtYWtlIHN1cmUgd2UKQEAgLTgzMSw3ICs4 MzEsMTAgQEAKIAkoc2V0Y2RyIGl0ZW0gKHNvcnQgKGNkciBpdGVtKSAnaW1lbnUtLXNvcnQtYnkt cG9zaXRpb24pKSkpCiAgICAgKGxldCAoKG1haW4tZWxlbWVudCAoYXNzcSBuaWwgaW5kZXgtYWxp c3QpKSkKICAgICAgIChuY29uYyAoZGVscSBtYWluLWVsZW1lbnQgKGRlbHEgJ2R1bW15IGluZGV4 LWFsaXN0KSkKLQkgICAgIChjZHIgbWFpbi1lbGVtZW50KSkpKSkKKyAgICAgICAgICAgICAoY2Ry IG1haW4tZWxlbWVudCkpKQorICAgIDs7IFJlbW92ZSBhbnkgZW1wdHkgbWVudXMuICBUaGF0IGNh biBoYXBwZW4gYmVjYXVzZSBvZiBza2lwcGluZyB0aGluZ3MgaW5zaWRlIGNvbW1lbnRzIG9yIHN0 cmluZ3MuCisgICAgKHdoZW4gKGNvbnNwIChjYXIgaW5kZXgtYWxpc3QpKQorICAgICAgKHNldHEg aW5kZXgtYWxpc3QgIChpbWVudXAtZGVsZXRlLWlmLW5vdCAobGFtYmRhIChpdCkgKGNkciBpdCkp IGluZGV4LWFsaXN0KSkpKSkKIAogOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OwogOzs7Cg== --__1530399205472323361abhmp0004.oracle.com-- ------------=_1530980582-32378-1--