From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#38539: char-fold-to-regexp and search-whitespace-regexp Date: Sun, 08 Dec 2019 23:22:57 +0200 Organization: LINKOV.NET Message-ID: <87v9qq3426.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="17248"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) To: 38539@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 08 22:57:31 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ie4YU-0004Mf-Ds for geb-bug-gnu-emacs@m.gmane.org; Sun, 08 Dec 2019 22:57:30 +0100 Original-Received: from localhost ([::1]:33686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie4YS-0003Yw-H3 for geb-bug-gnu-emacs@m.gmane.org; Sun, 08 Dec 2019 16:57:28 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44344) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie4Y6-0003WO-7d for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:57:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ie4Y4-0004j0-Jr for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:57:06 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ie4Y2-0004hN-Bb for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:57:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ie4Y2-0005yB-9d for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:57:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 08 Dec 2019 21:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38539 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.157584218122849 (code B ref -1); Sun, 08 Dec 2019 21:57:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 8 Dec 2019 21:56:21 +0000 Original-Received: from localhost ([127.0.0.1]:52340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ie4XN-0005wS-Ii for submit@debbugs.gnu.org; Sun, 08 Dec 2019 16:56:21 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:37032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ie4XM-0005wL-6M for submit@debbugs.gnu.org; Sun, 08 Dec 2019 16:56:20 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43358) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie4XK-0003CW-Sg for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:56:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ie4XJ-0002xx-0g for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:56:17 -0500 Original-Received: from bonobo.birch.relay.mailchannels.net ([23.83.209.22]:57024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ie4XI-0002qH-42 for bug-gnu-emacs@gnu.org; Sun, 08 Dec 2019 16:56:16 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id ED9B4501127 for ; Sun, 8 Dec 2019 21:56:13 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a35.g.dreamhost.com (100-96-14-7.trex.outbound.svc.cluster.local [100.96.14.7]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 8A390500E35 for ; Sun, 8 Dec 2019 21:56:13 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a35.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.18.5); Sun, 08 Dec 2019 21:56:13 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Company-Hysterical: 66434da56fa9ae64_1575842173779_95719334 X-MC-Loop-Signature: 1575842173779:3989239782 X-MC-Ingress-Time: 1575842173779 Original-Received: from pdx1-sub0-mail-a35.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a35.g.dreamhost.com (Postfix) with ESMTP id 097BB81F1D for ; Sun, 8 Dec 2019 13:56:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=linkov.net; bh=OyhpzVhlAKzjGyHOqus RpA4eztM=; b=P7DlS3x7HQZPPYMrwEhGhjoy8OKFfLOvHncU8x3kp/J+cmBXcgZ T8avY7MnzO8lhUhwxswXQikiIHVcsbImqC9yCYg6iBbws7KRjnufSYrH4/SVWL09 R/5/FN3Y/vnmAiqEYiRSJVCn+sTjJVqzc49JEyLW+n0EKzKMmcVgvZLw= Original-Received: from mail.jurta.org (m91-129-96-42.cust.tele2.ee [91.129.96.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a35.g.dreamhost.com (Postfix) with ESMTPSA id D38B77E466 for ; Sun, 8 Dec 2019 13:56:07 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a35 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:173069 Archived-At: I don't know but bug#35802 removed let-binding of search-spaces-regexp around the char-fold-to-regexp call in isearch-search-fun-default. Maybe this is fine, but makes the following slightly more isearch-depende= nt: search-whitespace-regexp matches a sequence of whitespace chars in isearch, i.e. by entering a space it matches any whitespace. For example, in *scratch* searching with =E2=80=98C-s M-s ' 1 2=E2=80=99 will match all these lines: 1 2 1 2 1=C2=A02 1=C2=A0=C2=A02 It would be natural to expect that when char-fold-symmetric is customized to non-nil, searching for =E2=80=98C-s M-s ' 1=C2=A02=E2=80= =99 will also match the above lines. After applying this patch, it does. diff --git a/lisp/char-fold.el b/lisp/char-fold.el index d8d2ebc72b..47a70ad681 100644 --- a/lisp/char-fold.el +++ b/lisp/char-fold.el @@ -324,6 +324,13 @@ char-fold-to-regexp (while (< i end) (pcase (aref string i) (?\s (setq spaces (1+ spaces))) + ((pred (lambda (c) (and char-fold-symmetric + (if isearch-regexp + isearch-regexp-lax-whitespace + isearch-lax-whitespace) + (stringp search-whitespace-regexp) + (string-match-p search-whitespace-regexp= (char-to-string c))))) + (setq spaces (1+ spaces))) (c (when (> spaces 0) (push (char-fold--make-space-string spaces) out) (setq spaces 0))