From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Xiansheng Ca Newsgroups: gmane.emacs.bugs Subject: bug#33852: 26.1; unhighlight-regexp unnecessary prompt Date: Sun, 23 Dec 2018 04:49:30 -0600 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1545589025 30051 195.159.176.226 (23 Dec 2018 18:17:05 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 23 Dec 2018 18:17:05 +0000 (UTC) To: 33852@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 23 19:17:00 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb8JA-0007hj-M0 for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Dec 2018 19:17:00 +0100 Original-Received: from localhost ([::1]:41228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gb8LG-0007ev-VW for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Dec 2018 13:19:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gb8LA-0007eb-Aq for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 13:19:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gb8L9-0000ci-Iz for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 13:19:04 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57998) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gb8L9-0000bp-56 for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 13:19:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gb8L8-0007nq-OA for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 13:19:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Xiansheng Ca Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Dec 2018 18:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33852 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.154558909729919 (code B ref -1); Sun, 23 Dec 2018 18:19:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Dec 2018 18:18:17 +0000 Original-Received: from localhost ([127.0.0.1]:34021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb8KO-0007mU-Of for submit@debbugs.gnu.org; Sun, 23 Dec 2018 13:18:17 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:56682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb1KQ-0002bL-G3 for submit@debbugs.gnu.org; Sun, 23 Dec 2018 05:49:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gb1KK-0002Bs-DP for submit@debbugs.gnu.org; Sun, 23 Dec 2018 05:49:45 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:40607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gb1KK-0002Bd-A0 for submit@debbugs.gnu.org; Sun, 23 Dec 2018 05:49:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gb1KJ-00035l-IR for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 05:49:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gb1KI-0002Ai-TR for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 05:49:43 -0500 Original-Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]:41888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gb1KI-0002AV-OQ for bug-gnu-emacs@gnu.org; Sun, 23 Dec 2018 05:49:42 -0500 Original-Received: by mail-io1-xd2e.google.com with SMTP id s22so7183797ioc.8 for ; Sun, 23 Dec 2018 02:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=/uRi07a6VBcurXOMExer2K4Hj6P/gzJfHGXz2oZwyxc=; b=nuugHotB0iT3r+1ohYuOItRNKMVbP8IKveVCh27kCOWcaNJlJ+VmCKvCJ9qtP+a/Hb CKp/E2d7S9teTJ9LpIzRAE4c1kpHowbOtQ2tOEzCPEiGgu5B0+Nm/16tflriHFPWiif+ PXW//qDCqi0x6I17MhKWoizyQgnChMq/F8kVE7GS3iyRNGcSAfjwdoGZQ2+dw2fb0aRr gU0/N44ZBg0biukxmDwHAbHX2cdtq9024ilt/JIrqj4/1x/ZhqXZVEt/yRgYhECFs1Kr F653+CYcQcHqwKmEAIbM6GmFNR2bAxeHLnw0n6A2sY13NdESojDnDIIWFyepWNBFR9h0 UUbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=/uRi07a6VBcurXOMExer2K4Hj6P/gzJfHGXz2oZwyxc=; b=n/8A09CW5JVHVEgSxNS+fK8xXRroNd3X/uTPjmZ6YYK6VOGVAm/P3W+b9nL4XQ+aC9 4e0TX5f3qgEb7+3XLwIrcuH1YtHgm/jGk5UnVzhCzfyhkngcAa83Ke6qiVOxCAyIDjNc 7+etaa+SWduz9Ip5GgnBMDn4oxpD5EPqKxz/zC1RswY+aZGyPYRSmxI0O3UzuBRxh7KB KqNEB6pm3RAp/+3rtixT9dqGLYZjBdnVqnD6e2CVE3fQByLugxj5haY3rkrqYZIxb8c1 1mPH8N35c/urNjqEyUyBWhknfHryOmO/bmMmm3aoTZGFFOe8GHB33uhLtoOSDsYJfhtL Vb5g== X-Gm-Message-State: AJcUukfD/uLh81lJaPAQL2RKpjkhV587NX9rCiQBj68ZAOMTfMB2xbrm aL/O7iYrVpO/AfPZ69d7gTRY6ICOAlxWPbHkY2b7dosS X-Google-Smtp-Source: ALg8bN4RSzpEcFgp1dCCiFRwHL8sS2Xz6QF3ccZCrylWo+qrqsFG9EmHLpCWiyCxoXJ+WG+FHQUOUxk7k7CuS4iru3c= X-Received: by 2002:a6b:c9c8:: with SMTP id z191mr6487299iof.13.1545562181838; Sun, 23 Dec 2018 02:49:41 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Mailman-Approved-At: Sun, 23 Dec 2018 13:18:14 -0500 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" Xref: news.gmane.org gmane.emacs.bugs:153802 Archived-At: Hello, In hi-lock-mode, after highlighting a single regular expression such as by M-s h r regexp , then unhighlighting with M-s h u, I'm prompted "Regexp to unhighlight (default regexp):", but any choice other than the default is rejected with the message "[No Match]". I would prefer not to be prompted if there is only a single acceptable choice. I believe the patch below implements this proposed behavior. Thank you for taking the time to consider this. >From c7918a6a09e91fc033a7288429ed4c466fba5e7c Mon Sep 17 00:00:00 2001 From: Ca Xiansheng Date: Sun, 23 Dec 2018 03:30:50 -0600 Subject: [PATCH] * lisp/hi-lock.el (unhighlight-regexp): Do not prompt if one choice. --- lisp/hi-lock.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 6eadd59..9377d84 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -602,13 +602,13 @@ then remove all hi-lock highlighting." ;; Infer the regexp to un-highlight based on cursor position. (let* ((defaults (or (hi-lock--regexps-at-point) (mapcar #'car hi-lock-interactive-patterns)))) - (list - (completing-read (if (null defaults) - "Regexp to unhighlight: " - (format "Regexp to unhighlight (default %s): " - (car defaults))) - hi-lock-interactive-patterns - nil t nil nil defaults)))))) + (list (if (and (consp defaults) (null (cdr defaults))) (car defaults) + (completing-read (if (null defaults) + "Regexp to unhighlight: " + (format "Regexp to unhighlight (default %s): " + (car defaults))) + hi-lock-interactive-patterns + nil t nil nil defaults))))))) (dolist (keyword (if (eq regexp t) hi-lock-interactive-patterns (list (assoc regexp hi-lock-interactive-patterns)))) (when keyword -- 2.20.1