From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.bugs Subject: bug#22991: 25.0.92: C-u C-s does not display "Regexp I-search:" in the echo area Date: Fri, 11 Mar 2016 15:46:29 -0500 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a113cd1fadc1e82052dcc0824 X-Trace: ger.gmane.org 1457729306 22722 80.91.229.3 (11 Mar 2016 20:48:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Mar 2016 20:48:26 +0000 (UTC) To: 22991@debbugs.gnu.org, Artur Malabarba Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 11 21:48:17 2016 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 1aeTyq-0006HV-Dj for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Mar 2016 21:48:16 +0100 Original-Received: from localhost ([::1]:57605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTym-0003Bs-If for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Mar 2016 15:48:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTyi-0003BV-8D for bug-gnu-emacs@gnu.org; Fri, 11 Mar 2016 15:48:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeTyc-0001xh-Ls for bug-gnu-emacs@gnu.org; Fri, 11 Mar 2016 15:48:08 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTyc-0001xN-Gq for bug-gnu-emacs@gnu.org; Fri, 11 Mar 2016 15:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aeTyc-00079Z-79 for bug-gnu-emacs@gnu.org; Fri, 11 Mar 2016 15:48:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Kaushal Modi Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 11 Mar 2016 20:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22991 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22991-submit@debbugs.gnu.org id=B22991.145772923527444 (code B ref 22991); Fri, 11 Mar 2016 20:48:02 +0000 Original-Received: (at 22991) by debbugs.gnu.org; 11 Mar 2016 20:47:15 +0000 Original-Received: from localhost ([127.0.0.1]:45476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aeTxr-00078a-LA for submit@debbugs.gnu.org; Fri, 11 Mar 2016 15:47:15 -0500 Original-Received: from mail-oi0-f41.google.com ([209.85.218.41]:32815) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aeTxq-00078L-H7 for 22991@debbugs.gnu.org; Fri, 11 Mar 2016 15:47:14 -0500 Original-Received: by mail-oi0-f41.google.com with SMTP id d205so94753621oia.0 for <22991@debbugs.gnu.org>; Fri, 11 Mar 2016 12:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=k60lE6+eR9aq6HLhVYLTUlBbKzPHQeQqN5Vc/EmYezo=; b=ZryEAUXWCIxsVfDhaCvruRqVnNna7Au6K+9OVbufqtmAGCHSGnrErqIRJgD81UOIpK lo5oQJlvtJ4/bgCObxwwYbXh8mbfNOUHTsrYGBcGACxAiZFNzmmol4vlhnr/PoZasjPf ojPzJ2z6VEK2kYmPSrGLP85ZeS/tZErRhXUJRkPw7Km3h4Whg/mISA6hWTUJBEuDuZPm mGZGeUcNPk5JPm5w89wx43MAA0iRRyp4moxnQXLB3Q7Df2QXc+4SvPNn+HLgiBhLkizE a2x0thpyc5wvmut9Qs+1RarAfy1SfEAuDsK5Usd7sIti4ARiJWmRug64+A8jej9AAVJX kW9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=k60lE6+eR9aq6HLhVYLTUlBbKzPHQeQqN5Vc/EmYezo=; b=BXPMPMlxpNASkmmYr8UYthvHaoPPxgA//8C6jATLdfKmkk5jjMajlmao98hFaMh+5Y lNU2N8bikmVJFC5IX6GFQaj7yw09RffLWgc0REqB1yLgkqQ8q7GteoBm7D+a+4S8XOWl fO6P2n5dEVKzyM9IGuOotibniLg3fLh5kb7Ymaw/Xo7oZXoIoxXzaTjBAC7mm5YvB4lP FTeeCJy00mu8JqphR6MJNg2K04x1g0SKPoM8R0gsCYYnXRqBAc0T5O5n7xB/POgpVIm+ KjJxyWr3Lz9gB+orgtNjGp5ggCCBchMJbxH18lRXK6Ac+k7vbOL/Z+6ol5ZQfecwYFJ+ 6hOw== X-Gm-Message-State: AD7BkJKRSaH+GRreXvXIj0xz7Yod0Kcx+8L7rG+rZxdC5CRlvxTPlCYe0nKBmPuWH0lzaSlT1JUQ9yvn1A+Ssw== X-Received: by 10.202.185.214 with SMTP id j205mr7045998oif.68.1457729228772; Fri, 11 Mar 2016 12:47:08 -0800 (PST) Original-Received: by 10.202.172.198 with HTTP; Fri, 11 Mar 2016 12:46:29 -0800 (PST) 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: 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:114783 Archived-At: --001a113cd1fadc1e82052dcc0824 Content-Type: text/plain; charset=UTF-8 Hi all, The below patch fixes this bug for me. I simply promoted the priority of isearch-regexp in that cond. I hope I am not overlooking something else by doing so. With that, now C-u C-s shows "Regexp I-search:" when the search of search-default-mode is either nil or character-fold-to-regexp. diff --git a/lisp/isearch.el b/lisp/isearch.el index b8ada2c..47dedfa 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2575,12 +2575,12 @@ isearch--describe-regexp-mode (setq regexp-function #'word-search-regexp)) (let ((description ;; Don't use a description on the default search mode. - (cond ((equal regexp-function search-default-mode) "") + (cond (isearch-regexp "regexp ") + ((equal regexp-function search-default-mode) "") (regexp-function (and (symbolp regexp-function) (or (get regexp-function 'isearch-message-prefix) ""))) - (isearch-regexp "regexp ") ;; We're in literal mode. If the default mode is not ;; literal, then describe it. ((functionp search-default-mode) "literal ")))) Apologies for earlier misunderstanding that this bug had to do with character-fold.el. -- Kaushal Modi --001a113cd1fadc1e82052dcc0824 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi all,

The below patch fixe= s this bug for me.

I simply promoted the priority = of isearch-regexp in that cond.

I hope I am not ov= erlooking something else by doing so.

With that, n= ow C-u C-s shows "Regexp I-search:" when the search of search-def= ault-mode is either nil or character-fold-to-regexp.


diff --git a/lisp/isearch.el b/lisp/isearch.el
= index b8ada2c..47dedfa 100644
--- a/lisp/isearch.el
+++= b/lisp/isearch.el
@@ -2575,12 +2575,12 @@ isearch--describe-rege= xp-mode
=C2=A0 =C2=A0 =C2=A0(setq regexp-function #'word-sear= ch-regexp))
=C2=A0 =C2=A0(let ((description
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 ;; Don't use a description on the default sear= ch mode.
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 (cond ((equal regexp-funct= ion search-default-mode) "")
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (cond (isearch-regexp "regexp ")
+ =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((equal regexp-function search-default-m= ode) "")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 (regexp-function
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(and (symbolp regexp-function)
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (or (= get regexp-function 'isearch-message-prefix)
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 "")))
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 (isearch-regexp "regexp ")
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; We're in literal mode. If the def= ault mode is not
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 ;; literal, then describe it.
=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((functionp search-default-mode) "literal= "))))


Apologies for earlier m= isunderstanding that this bug had to do with character-fold.el.
<= div class=3D"gmail_signature">

--
Kaushal Modi
=
--001a113cd1fadc1e82052dcc0824--