From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Drew Adams" Newsgroups: gmane.emacs.bugs Subject: bug#10123: 24.0.91; [PATCH] make Imenu ignore invisible definitions Date: Wed, 23 Nov 2011 16:57:50 -0800 Message-ID: <1380604F93A4406CB67F8E131E1F3FA7@us.oracle.com> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0054_01CCAA01.096A6A80" X-Trace: dough.gmane.org 1322096326 30159 80.91.229.12 (24 Nov 2011 00:58:46 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 24 Nov 2011 00:58:46 +0000 (UTC) To: <10123@debbugs.gnu.org> Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 24 01:58:42 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RTNeC-0000X8-Kd for geb-bug-gnu-emacs@m.gmane.org; Thu, 24 Nov 2011 01:58:40 +0100 Original-Received: from localhost ([::1]:46696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTNeB-0006wZ-Of for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Nov 2011 19:58:39 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:52233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTNe9-0006wU-Fq for bug-gnu-emacs@gnu.org; Wed, 23 Nov 2011 19:58:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTNe8-0002lF-CQ for bug-gnu-emacs@gnu.org; Wed, 23 Nov 2011 19:58:37 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTNe8-0002lB-9c for bug-gnu-emacs@gnu.org; Wed, 23 Nov 2011 19:58:36 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1RTNfX-0004Vg-9t for bug-gnu-emacs@gnu.org; Wed, 23 Nov 2011 20:00:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "Drew Adams" Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Nov 2011 01:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10123 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 10123-submit@debbugs.gnu.org id=B10123.132209636717247 (code B ref 10123); Thu, 24 Nov 2011 01:00:03 +0000 Original-Received: (at 10123) by debbugs.gnu.org; 24 Nov 2011 00:59:27 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RTNew-0004U8-Tw for submit@debbugs.gnu.org; Wed, 23 Nov 2011 19:59:27 -0500 Original-Received: from acsinet15.oracle.com ([141.146.126.227]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RTNeu-0004U1-JM for 10123@debbugs.gnu.org; Wed, 23 Nov 2011 19:59:25 -0500 Original-Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by acsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pAO0vtDH004539 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <10123@debbugs.gnu.org>; Thu, 24 Nov 2011 00:57:55 GMT Original-Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id pAO0vskL010124 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for <10123@debbugs.gnu.org>; Thu, 24 Nov 2011 00:57:55 GMT Original-Received: from abhmt106.oracle.com (abhmt106.oracle.com [141.146.116.58]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id pAO0vmxw009550 for <10123@debbugs.gnu.org>; Wed, 23 Nov 2011 18:57:49 -0600 Original-Received: from dradamslap1 (/10.159.44.3) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 23 Nov 2011 16:57:48 -0800 X-Mailer: Microsoft Office Outlook 11 In-Reply-To: Thread-Index: AcyqQSMHZB/LkfdqQpu2HGZo1Kt5dQAAnFnA X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.4ECD9694.0002,ss=1,re=0.000,fgs=0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Wed, 23 Nov 2011 20:00:03 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:54245 Archived-At: This is a multi-part message in MIME format. ------=_NextPart_000_0054_01CCAA01.096A6A80 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sorry; I sent the wrong patch. It needs to call `re-search-backward' with a non-nil, non-t 3rd arg: (re-search-backward regexp nil 'MOVE), not (re-search-backward regexp nil t). The attached patch should be OK. ------=_NextPart_000_0054_01CCAA01.096A6A80 Content-Type: application/octet-stream; name="imenu-2011-11-23b.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="imenu-2011-11-23b.patch" diff -c -w "imenu.el" "imenupatched.el"=0A= *** imenu.el Wed Nov 23 13:43:14 2011=0A= --- imenu-patched.el Wed Nov 23 13:47:16 2011=0A= ***************=0A= *** 800,806 ****=0A= (goto-char (point-max))=0A= (while (and (if (functionp regexp)=0A= (funcall regexp)=0A= ! (re-search-backward regexp nil t))=0A= ;; Exit the loop if we get an empty match,=0A= ;; because it means a bad regexp was specified.=0A= (not (=3D (match-beginning 0) (match-end 0))))=0A= --- 800,813 ----=0A= (goto-char (point-max))=0A= (while (and (if (functionp regexp)=0A= (funcall regexp)=0A= ! (and (re-search-backward regexp nil t)=0A= ! ;; Do not count invisible = definitions.=0A= ! (let ((invis (get-text-property = (point) 'invisible)))=0A= ! (or (not invis)=0A= ! (progn=0A= ! (while (and invis (not = (bobp)))=0A= ! (setq invis (not = (re-search-backward regexp nil 'MOVE))))=0A= ! (not invis))))))=0A= ;; Exit the loop if we get an empty match,=0A= ;; because it means a bad regexp was = specified.=0A= (not (=3D (match-beginning 0) (match-end = 0))))=0A= =0A= Diff finished at Wed Nov 23 13:48:05=0A= ------=_NextPart_000_0054_01CCAA01.096A6A80--