From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.bugs Subject: bug#23038: 25.0.92; M-% from isearch broken (error in isearch--describe-regexp-mode) Date: Fri, 18 Mar 2016 00:53:49 -0300 Message-ID: References: <87r3f98agb.fsf@web.de> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=94eb2c07ebacd73bab052e4ab1c4 X-Trace: ger.gmane.org 1458273260 7966 80.91.229.3 (18 Mar 2016 03:54:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Mar 2016 03:54:20 +0000 (UTC) Cc: Michael Heerdegen , 23038@debbugs.gnu.org To: Kaushal Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 18 04:54:11 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 1aglUI-0003qy-H1 for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Mar 2016 04:54:10 +0100 Original-Received: from localhost ([::1]:41395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aglUH-000530-U8 for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Mar 2016 23:54:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aglUD-00050e-T6 for bug-gnu-emacs@gnu.org; Thu, 17 Mar 2016 23:54:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aglUA-0006yH-Ms for bug-gnu-emacs@gnu.org; Thu, 17 Mar 2016 23:54:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aglUA-0006yD-Jr for bug-gnu-emacs@gnu.org; Thu, 17 Mar 2016 23:54:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1aglUA-0000RS-A2 for bug-gnu-emacs@gnu.org; Thu, 17 Mar 2016 23:54:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Artur Malabarba Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 18 Mar 2016 03:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23038 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23038-submit@debbugs.gnu.org id=B23038.14582732371686 (code B ref 23038); Fri, 18 Mar 2016 03:54:02 +0000 Original-Received: (at 23038) by debbugs.gnu.org; 18 Mar 2016 03:53:57 +0000 Original-Received: from localhost ([127.0.0.1]:51629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aglU4-0000R8-VL for submit@debbugs.gnu.org; Thu, 17 Mar 2016 23:53:57 -0400 Original-Received: from mail-yw0-f169.google.com ([209.85.161.169]:34158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aglU3-0000Qw-9x for 23038@debbugs.gnu.org; Thu, 17 Mar 2016 23:53:55 -0400 Original-Received: by mail-yw0-f169.google.com with SMTP id h129so125260762ywb.1 for <23038@debbugs.gnu.org>; Thu, 17 Mar 2016 20:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc; bh=g8np9v73G3xMuJ7B6R9hOfNa0KzDDrdDN0thOKHhLvs=; b=hZjCxRsS2nZmd4UHLiAuj2tfbp4p4C6a8xOvzEG1a1zyg7OerxArVixYvFOy7U2It6 BKyM+fW9sEt7PY4DDzReJsUNUumP/AmbGQAHCx62afiyIZWX3ENpFg96IXJLJfm2K/Vm 4UmJurHiL6S/XZx4gx1Pr8B2uwS9FIEAAxnbzP8NbdPIDHZObZRKIBE/GoYIWFzXqSHR gUWstPAsSgpUhqwk+fmm0/foghEhoybyzTdvHKIOgxpGviMdLyh8vtq6qLjl0AkYXiQH ubVGhE7ppk08aH4a8dZoowTsL4GXjI1uViM/RrWK/o4m900SJSw0+4e9wrHR+1QVOj6R crbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:sender:in-reply-to :references:date:message-id:subject:from:to:cc; bh=g8np9v73G3xMuJ7B6R9hOfNa0KzDDrdDN0thOKHhLvs=; b=jO7KWiE2VEC90AdMBPeCBWHUivVkYbwdsxnGHHZJV1oK645f8OcUhyhddBOoOMcYmb B+2VXCLM2DsKfN4k5Qca1/ZS52wtjv+4pzq+5EqIwYu55O5q4Z7N7+cKm4gfWhqIPo4I t9bh/ETRXzqDPlff586OjM+GAS638+P8gr+aJ/Rx04xYnUkmw9cKCuxtIScrwK+cmQnC Qv7U7Eh4LsHa1VQZ70nUDexSl8U8qp2IjahHO8xK6n8diTIyzBfYqCYUDJyzBCtJCfOT 5RhGQnZVGz7CkyxyirXfbRL60CwYdvrBLO+Qn//V7yjOTDSDNayVo5Q7HPJeW1waogN0 mUPg== X-Gm-Message-State: AD7BkJIJ83Pqz1nJGqmSL/ayZeZsrudFAEJZVHlFVbP31ShoFDfmRgVuzWdJVrZu4F57dMi20xXxeah2bLntpg== X-Received: by 10.129.129.6 with SMTP id r6mr5669142ywf.89.1458273229681; Thu, 17 Mar 2016 20:53:49 -0700 (PDT) Original-Received: by 10.129.31.5 with HTTP; Thu, 17 Mar 2016 20:53:49 -0700 (PDT) Original-Received: by 10.129.31.5 with HTTP; Thu, 17 Mar 2016 20:53:49 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: kP5DBV2WL-AXjtj6QanRkx1E4cg 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:115018 Archived-At: --94eb2c07ebacd73bab052e4ab1c4 Content-Type: text/plain; charset=UTF-8 On 17 Mar 2016 11:26 am, "Kaushal Modi" wrote: > > I would let you and others evaluate this proposed fix. > > diff --git a/lisp/isearch.el b/lisp/isearch.el > index 988503e..9b8a0f0 100644 > --- a/lisp/isearch.el > +++ b/lisp/isearch.el > @@ -2594,7 +2594,8 @@ isearch--describe-regexp-mode > (isearch-regexp "regexp ") > ;; 4. And finally, if we're in literal mode (and if the > ;; default mode is also not literal), describe it. > - ((functionp search-default-mode) "literal ")))) > + ((functionp search-default-mode) "literal ") > + (t "")))) > (if space-before > ;; Move space from the end to the beginning. > (replace-regexp-in-string "\\(.*\\) \\'" " \\1" description) Thanks Kaushal! It looks good to me. --94eb2c07ebacd73bab052e4ab1c4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On 17 Mar 2016 11:26 am, "Kaushal Modi" <kaushal.modi@gmail.com> wrote:
>
> I would let you and others evaluate this proposed fix.
>
> diff --git a/lisp/isearch.el b/lisp/isearch.el
> index 988503e..9b8a0f0 100644
> --- a/lisp/isearch.el
> +++ b/lisp/isearch.el
> @@ -2594,7 +2594,8 @@ isearch--describe-regexp-mode
> =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;; 4. And finally, if we'= re in literal mode (and if the
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; =C2=A0 =C2=A0default mode = is also not literal), describe it.
> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((functionp search-= default-mode) "literal "))))
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((functionp search-default-mode) &= quot;literal ")
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(t ""))))
> =C2=A0 =C2=A0 =C2=A0(if space-before
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; Move space from the end to the be= ginning.
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(replace-regexp-in-string "\\(.= *\\) \\'" " \\1" description)

Thanks Kaushal! It looks good to me.

--94eb2c07ebacd73bab052e4ab1c4--