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#21176: 25.0.50; Garbage in the header line of *Occur* buffers Date: Wed, 14 Oct 2015 19:09:36 +0300 Organization: LINKOV.NET Message-ID: <87a8rlph33.fsf@mail.linkov.net> References: <83pp37uqit.fsf@gnu.org> <83oairuoqg.fsf@gnu.org> <87lhdtsbil.fsf@mail.linkov.net> <877fmr6dod.fsf@mail.linkov.net> <87wpuq4e6p.fsf@mail.linkov.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1444840363 13796 80.91.229.3 (14 Oct 2015 16:32:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 Oct 2015 16:32:43 +0000 (UTC) Cc: 21176@debbugs.gnu.org To: Dani Moncayo Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 14 18:32:32 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 1ZmOyb-0005J0-Gh for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Oct 2015 18:32:29 +0200 Original-Received: from localhost ([::1]:43498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOya-00048V-PR for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Oct 2015 12:32:28 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOxF-0002za-Ak for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 12:31:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmOxC-0008Bq-5I for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 12:31:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOxC-0008Bd-2O for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 12:31:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZmOxB-0003um-Sj for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 12:31: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: Wed, 14 Oct 2015 16:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21176 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21176-submit@debbugs.gnu.org id=B21176.144484021814979 (code B ref 21176); Wed, 14 Oct 2015 16:31:01 +0000 Original-Received: (at 21176) by debbugs.gnu.org; 14 Oct 2015 16:30:18 +0000 Original-Received: from localhost ([127.0.0.1]:40468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZmOwT-0003tV-Da for submit@debbugs.gnu.org; Wed, 14 Oct 2015 12:30:17 -0400 Original-Received: from sub3.mail.dreamhost.com ([69.163.253.7]:41211 helo=homiemail-a13.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZmOwQ-0003sU-1M for 21176@debbugs.gnu.org; Wed, 14 Oct 2015 12:30:16 -0400 Original-Received: from homiemail-a13.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a13.g.dreamhost.com (Postfix) with ESMTP id 1332F33406C; Wed, 14 Oct 2015 09:30:13 -0700 (PDT) Original-Received: from localhost.linkov.net (unknown [212.119.150.152]) (Authenticated sender: jurta@jurta.org) by homiemail-a13.g.dreamhost.com (Postfix) with ESMTPA id 2CC3C33406F; Wed, 14 Oct 2015 09:30:11 -0700 (PDT) In-Reply-To: (Dani Moncayo's message of "Wed, 14 Oct 2015 00:25:31 +0200") 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:107608 Archived-At: >> I still see garbage that you reported with (setq character-fold-search t). > > Oh, I didn't notice that the default value of that variable was > changed to nil. Then you're right - the bug isn't fixed yet. > >> While your bug report is closed, I can't fix it. > > Can't you? The status of a bug report should not prevent you from > doing anything. ;) > > Ok, I've just re-opened the bug report. Thanks, it's more comfortable to fix open bugs rather than closed :) For this bug the only good solution I see is like in this patch: diff --git a/lisp/isearch.el b/lisp/isearch.el index 4fc9b38..16ed9af 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1831,7 +1839,12 @@ (defun isearch-occur (regexp &optional nlines) isearch-regexp-lax-whitespace isearch-lax-whitespace) search-whitespace-regexp))) - (occur regexp nlines))) + (occur (if isearch-word + (propertize regexp + 'isearch-string isearch-string + 'isearch-word-mode (isearch--describe-word-mode isearch-word)) + regexp) + nlines))) (declare-function hi-lock-read-face-name "hi-lock" ()) diff --git a/lisp/replace.el b/lisp/replace.el index 3a908ac..718499f 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1657,8 +1657,12 @@ (defun occur-engine (regexp buffers out-buf nlines case-fold lines (if (= lines 1) "" "s"))) ;; Don't display regexp for multi-buffer. (if (> (length buffers) 1) - "" (format " for \"%s\"" - (query-replace-descr regexp))) + "" (format " for %s\"%s\"" + (or (get-text-property 0 'isearch-word-mode regexp) + "") + (query-replace-descr + (or (get-text-property 0 'isearch-string regexp) + regexp)))) (buffer-name buf)) 'read-only t)) (setq end (point))