From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#56815: 29.0.50; Isearch lazy-highlight highlights too much when truncate-lines is in effect Date: Tue, 23 Aug 2022 10:41:21 +0300 Organization: LINKOV.NET Message-ID: <86zgfvie26.fsf@mail.linkov.net> References: <83mtct87ti.fsf@gnu.org> <83fsik8o39.fsf@gnu.org> <87r124kul6.fsf@gnus.org> <86mtcrpyzs.fsf@mail.linkov.net> <83bkt77nf9.fsf@gnu.org> <83a68r7m2d.fsf@gnu.org> <837d3v7kr9.fsf@gnu.org> <86fsih5bch.fsf@mail.linkov.net> <83wnbs2nc3.fsf@gnu.org> <86y1w7bzum.fsf@mail.linkov.net> <83r11jj5ht.fsf@gnu.org> <86v8qlljwp.fsf@mail.linkov.net> <83k071bk6z.fsf@gnu.org> <86edx9fmgb.fsf@mail.linkov.net> <83fshpbdab.fsf@gnu.org> <86sfloixio.fsf@mail.linkov.net> <838rngbjke.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32596"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: 56815@debbugs.gnu.org, gregory@heytings.org, larsi@gnus.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Aug 23 10:11:14 2022 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 1oQP0D-0008Jo-O6 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Aug 2022 10:11:13 +0200 Original-Received: from localhost ([::1]:34100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQP0C-0002KH-NJ for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Aug 2022 04:11:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQOz4-0002HV-Ak for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 04:10:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQOz3-0002FD-QV for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 04:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQOz3-0000Td-Lr for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 04:10:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Aug 2022 08:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56815 X-GNU-PR-Package: emacs Original-Received: via spool by 56815-submit@debbugs.gnu.org id=B56815.16612421441764 (code B ref 56815); Tue, 23 Aug 2022 08:10:01 +0000 Original-Received: (at 56815) by debbugs.gnu.org; 23 Aug 2022 08:09:04 +0000 Original-Received: from localhost ([127.0.0.1]:42498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQOy7-0000SO-Oz for submit@debbugs.gnu.org; Tue, 23 Aug 2022 04:09:04 -0400 Original-Received: from relay12.mail.gandi.net ([217.70.178.232]:36063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQOy6-0000Rf-4f for 56815@debbugs.gnu.org; Tue, 23 Aug 2022 04:09:02 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 55BEE200007; Tue, 23 Aug 2022 08:08:55 +0000 (UTC) In-Reply-To: <838rngbjke.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 22 Aug 2022 14:32:01 +0300") 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:240507 Archived-At: --=-=-= Content-Type: text/plain >> Or can truncated-partial-width-window-p be called directly? By just >> >> (or truncate-lines (truncated-partial-width-window-p)) > > Fine by me. Then I'll push a better patch: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=truncated-partial-width-window-p.patch diff --git a/lisp/simple.el b/lisp/simple.el index 460aff8bd8..72674d3a1d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -7700,13 +7700,7 @@ line-move ;; Lines are not truncated... (not (and - (or truncate-lines - (and (integerp truncate-partial-width-windows) - (< (window-total-width) - truncate-partial-width-windows)) - (and truncate-partial-width-windows - (not (integerp truncate-partial-width-windows)) - (not (window-full-width-p)))) + (or truncate-lines (truncated-partial-width-window-p)) ;; ...or if lines are truncated, this buffer ;; doesn't have very long lines. (long-line-optimizations-p))) @@ -7716,14 +7710,7 @@ line-move ;; Display-based column are incompatible with goal-column. (not goal-column) ;; Lines aren't truncated. - (not - (or truncate-lines - (and (integerp truncate-partial-width-windows) - (< (window-width) - truncate-partial-width-windows)) - (and truncate-partial-width-windows - (not (integerp truncate-partial-width-windows)) - (not (window-full-width-p))))) + (not (or truncate-lines (truncated-partial-width-window-p))) ;; When the text in the window is scrolled to the left, ;; display-based motion doesn't make sense (because each ;; logical line occupies exactly one screen line). diff --git a/lisp/window.el b/lisp/window.el index 4d88ffa903..98c14e7bbc 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -9044,10 +9055,7 @@ count-screen-lines ;; vertical-motion returns a number that is 1 larger than it ;; should. We need to fix that. (setq end-invisible-p - (and (or truncate-lines - (and (natnump truncate-partial-width-windows) - (< (window-total-width window) - truncate-partial-width-windows))) + (and (or truncate-lines (truncated-partial-width-window-p window)) (save-excursion (goto-char finish) (> (- (current-column) (window-hscroll window)) --=-=-=--