From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Newsgroups: gmane.emacs.bugs Subject: bug#39121: 27.0.60; occur: Add bindings for next-error-no-select Date: Fri, 23 Jul 2021 15:32:43 +0200 Message-ID: References: <87r1fzi7c3.fsf@mail.linkov.net> Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.21\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_0FAC9DB9-EC7C-4225-AA93-CA76A3C60964" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21306"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 39121@debbugs.gnu.org, Tino Calancha To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 23 15:33:26 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 1m6vIr-0005Mx-W7 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 23 Jul 2021 15:33:26 +0200 Original-Received: from localhost ([::1]:55970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6vIq-00008s-N8 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 23 Jul 2021 09:33:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6vIW-000069-8u for bug-gnu-emacs@gnu.org; Fri, 23 Jul 2021 09:33:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6vIU-0006xh-Dc for bug-gnu-emacs@gnu.org; Fri, 23 Jul 2021 09:33:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6vIU-0007Kc-8U for bug-gnu-emacs@gnu.org; Fri, 23 Jul 2021 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 Jul 2021 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39121 X-GNU-PR-Package: emacs Original-Received: via spool by 39121-submit@debbugs.gnu.org id=B39121.162704717128164 (code B ref 39121); Fri, 23 Jul 2021 13:33:02 +0000 Original-Received: (at 39121) by debbugs.gnu.org; 23 Jul 2021 13:32:51 +0000 Original-Received: from localhost ([127.0.0.1]:42624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6vIJ-0007KB-Hr for submit@debbugs.gnu.org; Fri, 23 Jul 2021 09:32:51 -0400 Original-Received: from mail158c50.megamailservers.eu ([91.136.10.168]:50000 helo=mail51c50.megamailservers.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6vIG-0007Jz-Kt for 39121@debbugs.gnu.org; Fri, 23 Jul 2021 09:32:49 -0400 X-Authenticated-User: mattiase@bredband.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1627047166; bh=ks9IJnRr+OaPHQTznGSmUwukUl27cJDxjaBFeLHVDfg=; h=From:Subject:Date:In-Reply-To:Cc:To:References:From; b=ETFum4jtTHMuBWuWp8UNFmExZCPboVuFGozuvy3oNkTkapSNqzpTp5zfyOauOdQ6r aXFt38UVo628/jq5a5q0oGpnI3/FXQSxOTYnw4HRra3HT1T0NtwiuCxTm4Nj+jJkvo fx9maMIVJjJ8JHClE1nQg42zGngbK0DhbGTrcK4A= Feedback-ID: mattiase@acm.or Original-Received: from [192.168.0.4] (c188-150-171-71.bredband.tele2.se [188.150.171.71]) (authenticated bits=0) by mail51c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id 16NDWiYK031317; Fri, 23 Jul 2021 13:32:45 +0000 In-Reply-To: <87r1fzi7c3.fsf@mail.linkov.net> X-Mailer: Apple Mail (2.3445.104.21) X-CTCH-RefID: str=0001.0A742F1C.60FAC4FE.0025, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=WOsBoUkR c=1 sm=1 tr=0 a=SF+I6pRkHZhrawxbOkkvaA==:117 a=SF+I6pRkHZhrawxbOkkvaA==:17 a=M51BFTxLslgA:10 a=1KwMS72DUbnJ8CmukG0A:9 a=CjuIK1q_8ugA:10 a=U0tnTJfVmRB5EyVBDQoA:9 a=De_Ol2h6w80A:10 X-Origin-Country: SE 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:210586 Archived-At: --Apple-Mail=_0FAC9DB9-EC7C-4225-AA93-CA76A3C60964 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii As a cheapo fix to prevent the (possibly misguided) external package = from crashing in Emacs 28, what about this? --Apple-Mail=_0FAC9DB9-EC7C-4225-AA93-CA76A3C60964 Content-Disposition: attachment; filename=occur.diff Content-Type: application/octet-stream; x-unix-mode=0644; name="occur.diff" Content-Transfer-Encoding: 7bit diff --git a/lisp/replace.el b/lisp/replace.el index ed81097e14..d39ebeca15 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1305,8 +1305,11 @@ occur-mode-goto-occurrence (regexp occur-highlight-regexp)) (pop-to-buffer (marker-buffer pos)) (goto-char pos) - (let ((end-mk (save-excursion (re-search-forward regexp nil t)))) - (occur--highlight-occurrence pos end-mk)) + (when regexp + (let ((end-mk (if (stringp regexp) + (save-excursion (re-search-forward regexp nil t)) + (line-end-position)))) + (occur--highlight-occurrence pos end-mk))) (when buffer (next-error-found buffer (current-buffer))) (run-hooks 'occur-mode-find-occurrence-hook))) @@ -1386,8 +1389,11 @@ occur-mode-display-occurrence (save-selected-window (select-window window) (goto-char pos) - (let ((end-mk (save-excursion (re-search-forward regexp nil t)))) - (occur--highlight-occurrence pos end-mk)) + (when regexp + (let ((end-mk (if (stringp regexp) + (save-excursion (re-search-forward regexp nil t)) + (line-end-position)))) + (occur--highlight-occurrence pos end-mk))) (next-error-found buffer (current-buffer)) (run-hooks 'occur-mode-find-occurrence-hook)))) --Apple-Mail=_0FAC9DB9-EC7C-4225-AA93-CA76A3C60964--