From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#50466: 28.0.50; isearch isearch-repeat-on-direction-change vs isearch-beginning-of-buffer Date: Wed, 08 Sep 2021 08:01:55 +0200 Message-ID: <871r5z8v1o.fsf@gnus.org> References: <87zgsnzz8k.fsf.ref@aol.com> <87zgsnzz8k.fsf@aol.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21264"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 50466@debbugs.gnu.org, Juri Linkov To: Ergus Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 08 08:05:12 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 1mNqhs-0005KU-2V for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 08 Sep 2021 08:05:12 +0200 Original-Received: from localhost ([::1]:40530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNqhq-0007Hl-Ph for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 08 Sep 2021 02:05:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNqfm-0005mC-Qa for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2021 02:03:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNqfm-0002Pg-J9 for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2021 02:03:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNqfm-0000ex-FH for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2021 02:03:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Sep 2021 06:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50466 X-GNU-PR-Package: emacs Original-Received: via spool by 50466-submit@debbugs.gnu.org id=B50466.16310809282468 (code B ref 50466); Wed, 08 Sep 2021 06:03:02 +0000 Original-Received: (at 50466) by debbugs.gnu.org; 8 Sep 2021 06:02:08 +0000 Original-Received: from localhost ([127.0.0.1]:58271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNqeu-0000dj-D8 for submit@debbugs.gnu.org; Wed, 08 Sep 2021 02:02:08 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:55582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNqes-0000dD-Hq for 50466@debbugs.gnu.org; Wed, 08 Sep 2021 02:02:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=S6L1xEZy+QMAONUG5LxN0SWnxOXhnY22hRedwcR6JEg=; b=gRXSOM7U/MmGOBK2EhnxBM47gF wbcMdY3DFmUIVLG/Ah9Lzdj4epD3bamfAXKi0buT05/08Gp2QEYlh9yWbsudfsqFrMboE3LA0sx1J /ld0sN5l1tEfOUDs6gROB7CFv4oIKiInMzwc0HbsVMErWyJ8NjAmiBL/2y1yE8vjlSVc=; Original-Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mNqek-0007ZI-69; Wed, 08 Sep 2021 08:02:00 +0200 In-Reply-To: <87zgsnzz8k.fsf@aol.com> (Ergus's message of "Wed, 08 Sep 2021 02:29:15 +0200") 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:213772 Archived-At: Ergus writes: > (setq isearch-repeat-on-direction-change t) > (define-key isearch-mode-map (kbd "M-<") #'isearch-beginning-of-buffer) > > If I have the cursor on the beginning of: > > 1abc > 2abc > 3abc > 4abc > > and do > > C-s abc ;; cursor at the end of 1abc > C-s ;; cursor at the end of 2abc > C-s ;; cursor at the end of 3abc > C-r ;; cursor at the beginning of 2abc > M-< ;; cursor at the end of 3abc <- this is wrong > > The cursor goes to the end of 3abc (next candidate) instead of 1abc > (first) as expected from isearch-beginning-of-buffer. Simpler reproduction: Go to the end of the 3abc line and C-r abc M-< That'll take you to the end of 4abc. And it's because: (defun isearch-beginning-of-buffer (&optional arg) [...] (setq isearch-just-started t) (goto-char (point-min)) (isearch-repeat 'forward arg))) (defun isearch-repeat (direction &optional count) [...] ;; C-s in reverse or C-r in forward, change direction. (if (and isearch-other-end isearch-repeat-on-direction-change) (goto-char isearch-other-end)) The following patch seems to fix the problem: diff --git a/lisp/isearch.el b/lisp/isearch.el index 1c776a06e1..6abd12700c 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1898,7 +1898,8 @@ isearch-repeat (funcall isearch-wrap-function) (goto-char (if isearch-forward (point-min) (point-max)))))) ;; C-s in reverse or C-r in forward, change direction. - (if (and isearch-other-end isearch-repeat-on-direction-change) + (if (and isearch-other-end isearch-repeat-on-direction-change + (not isearch-just-started)) (goto-char isearch-other-end)) (setq isearch-forward (not isearch-forward) isearch-success t)) But I'm not really very familiar with the isearch machinery, so I've added Juri to the CCs; perhaps he has a comment here. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no