From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Drew Adams Newsgroups: gmane.emacs.bugs Subject: bug#32024: 27.0; [PATCH] `imenu--generic-function' Date: Sat, 30 Jun 2018 15:53:22 -0700 (PDT) Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__1530399205472323361abhmp0004.oracle.com" X-Trace: blaine.gmane.org 1530399132 20903 195.159.176.226 (30 Jun 2018 22:52:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 30 Jun 2018 22:52:12 +0000 (UTC) To: 32024@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jul 01 00:52:08 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 1fZOit-0005Hv-1n for geb-bug-gnu-emacs@m.gmane.org; Sun, 01 Jul 2018 00:52:07 +0200 Original-Received: from localhost ([::1]:48210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZOky-0001ab-D1 for geb-bug-gnu-emacs@m.gmane.org; Sat, 30 Jun 2018 18:54:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZOkr-0001aK-96 for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:54:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZOkl-0005Yp-00 for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:54:09 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZOkk-0005Yh-RW for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:54:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fZOkk-00075X-K0 for bug-gnu-emacs@gnu.org; Sat, 30 Jun 2018 18:54:02 -0400 X-Loop: help-debbugs@gnu.org 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 X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.153039922127214 (code B ref -1); Sat, 30 Jun 2018 22:54:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 30 Jun 2018 22:53:41 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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== Original-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 Original-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 Original-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 X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.9.1 (1003210) [OL 16.0.4705.0 (x86)] 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-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:148031 Archived-At: --__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--