From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#17453: Isearch doesn't work properly with Follow Mode. Date: Wed, 04 Nov 2015 02:28:08 +0200 Organization: LINKOV.NET Message-ID: <87mvuur4kn.fsf@mail.linkov.net> References: <20151102092853.GA11804@acm.fritz.box> <20151102123512.GB11804@acm.fritz.box> <20151102154445.GD11804@acm.fritz.box> <87h9l46l7o.fsf@mail.linkov.net> <20151103123116.GD2258@acm.fritz.box> <83a8qvw0aq.fsf@gnu.org> <20151103221131.GG2258@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1446597031 27593 80.91.229.3 (4 Nov 2015 00:30:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Nov 2015 00:30:31 +0000 (UTC) Cc: 17453@debbugs.gnu.org, Artur Malabarba To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 04 01:30:13 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ztlxs-0004Ex-JF for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 Nov 2015 01:30:12 +0100 Original-Received: from localhost ([::1]:51813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ztlxs-0004DW-0X for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Nov 2015 19:30:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ztlxo-0004DL-Ag for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2015 19:30:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ztlxl-0001p7-0s for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2015 19:30:08 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ztlxk-0001p0-Ua for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2015 19:30:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ztlxk-0001ik-9d for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2015 19:30:04 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Nov 2015 00:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17453 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17453-submit@debbugs.gnu.org id=B17453.14465969696559 (code B ref 17453); Wed, 04 Nov 2015 00:30:03 +0000 Original-Received: (at 17453) by debbugs.gnu.org; 4 Nov 2015 00:29:29 +0000 Original-Received: from localhost ([127.0.0.1]:52003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZtlxA-0001hi-Ix for submit@debbugs.gnu.org; Tue, 03 Nov 2015 19:29:29 -0500 Original-Received: from sub3.mail.dreamhost.com ([69.163.253.7]:54893 helo=homiemail-a75.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ztlx8-0001hZ-6p for 17453@debbugs.gnu.org; Tue, 03 Nov 2015 19:29:27 -0500 Original-Received: from homiemail-a75.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a75.g.dreamhost.com (Postfix) with ESMTP id 2A1045EC072; Tue, 3 Nov 2015 16:29:25 -0800 (PST) Original-Received: from localhost.linkov.net (85.253.169.191.cable.starman.ee [85.253.169.191]) (Authenticated sender: jurta@jurta.org) by homiemail-a75.g.dreamhost.com (Postfix) with ESMTPA id DC6AE5EC07C; Tue, 3 Nov 2015 16:29:23 -0800 (PST) In-Reply-To: <20151103221131.GG2258@acm.fritz.box> (Alan Mackenzie's message of "Tue, 3 Nov 2015 22:11:31 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:108404 Archived-At: >> >> This is complicated. Ideally, the Follow Mode windows should be >> >> synchronised in FM's post-command-hook, not isearch's. It is not >> >> isearch's job to realign windows. follow-post-command-hook both realigns >> >> windows and choses an appropriate window to put point in. We should let >> >> it. > >> > Once again, if some code in Isearch calls the same function that is >> > used in follow-post-command-hook, the above is not an issue. >> > Moreover, saving some calls to the hook will make Emacs more >> > responsive. > >> I agree with Eli and Juri on this. If there's a solution as simple as >> calling a follow-mode function in isearch-post-update-hook, then this >> sounds like a no-downside solution. > > I'm wondering if we're still talking about the same problem. ;-) A > simpler solution is _not_ to call a FM function from that Isearch hook. > Unless we're talking at cross purposes, there is simply no need. As > long as the Isearch command is allowed to go to completion without > forcibly redisplaying, FM will re-synchronise the windows (if needed) > and select an appropriate window for point, all on its own (in > follow-post-command-hook). It still might help to synchronise the windows from isearch-update-post-hook if we'll call it before calling isearch-lazy-highlight-new-loop with sit-for. I see no problem in changing the order of calls to isearch-update-post-hook and isearch-lazy-highlight-new-loop in isearch-update. Sure, follow-post-command-hook will be called twice but at least this simple solution for follow-mode doesn't require re-designing the whole lazy-highlighting machinery. diff --git a/lisp/follow.el b/lisp/follow.el index 938c59e..75c2788 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -420,6 +420,7 @@ (define-minor-mode follow-mode (if follow-mode (progn (add-hook 'compilation-filter-hook 'follow-align-compilation-windows t t) + (add-hook 'isearch-update-post-hook 'follow-post-command-hook t t) (add-hook 'post-command-hook 'follow-post-command-hook t) (add-hook 'window-size-change-functions 'follow-window-size-change t)) ;; Remove globally-installed hook functions only if there is no @@ -432,6 +433,7 @@ (define-minor-mode follow-mode (unless following (remove-hook 'post-command-hook 'follow-post-command-hook) (remove-hook 'window-size-change-functions 'follow-window-size-change))) + (remove-hook 'isearch-update-post-hook 'follow-post-command-hook t) (remove-hook 'compilation-filter-hook 'follow-align-compilation-windows t))) (defun follow-find-file-hook () diff --git a/lisp/isearch.el b/lisp/isearch.el index b762884..1e4a1a5 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1011,12 +1011,12 @@ (defun isearch-update () (setq ;; quit-flag nil not for isearch-mode isearch-adjusted nil isearch-yank-flag nil) - (when isearch-lazy-highlight - (isearch-lazy-highlight-new-loop)) ;; We must prevent the point moving to the end of composition when a ;; part of the composition has just been searched. (setq disable-point-adjustment t) - (run-hooks 'isearch-update-post-hook)) + (run-hooks 'isearch-update-post-hook) + (when isearch-lazy-highlight + (isearch-lazy-highlight-new-loop))) (defun isearch-done (&optional nopush edit) "Exit Isearch mode.