From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Patch] Add project.el command to replace symbol at point throughout project Date: Mon, 17 Jan 2022 03:15:54 +0200 Message-ID: <0b8d87f8-e6db-9902-bd89-d81864d626d6@yandex.ru> References: <83zgo2770l.fsf@gnu.org> <83zgo15dhp.fsf@gnu.org> <83czkw3uvl.fsf@gnu.org> <170a1c89-7767-0930-f726-f7b2551876b2@yandex.ru> <44f72f97-d1d8-0b4c-73a0-7f077fb1ef26@yandex.ru> <0617E8BF-CC43-4D82-8648-064252F644FD@gmail.com> <86pmos3no7.fsf@mail.linkov.net> <86czkr36ll.fsf@mail.linkov.net> <921c0b69-7bac-b78a-54d8-987165331661@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40148"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 Cc: Jon Eskin , Eli Zaretskii , emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Jan 17 02:19:25 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n9Gg8-000AKg-MA for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Jan 2022 02:19:24 +0100 Original-Received: from localhost ([::1]:59654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9Gg7-00019h-B8 for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Jan 2022 20:19:23 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9GeM-0000Kr-Tc for emacs-devel@gnu.org; Sun, 16 Jan 2022 20:17:37 -0500 Original-Received: from [2a00:1450:4864:20::32b] (port=41770 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9GeJ-0006CM-88; Sun, 16 Jan 2022 20:17:34 -0500 Original-Received: by mail-wm1-x32b.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so19211066wme.0; Sun, 16 Jan 2022 17:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=MCp5gkbqKS0RvZFKzFKSNuHoKmiCM0Epn/XAc+RYQ90=; b=RrXplZiIauU/OVnmRhCen4OYDsXeSbn8t48ZYOiBAzck7M5U+ZB2ZzSHw5GPltx4om iGgKvIp12G7NQW1R3//T59ZkPBTJtKONVo2CcZGyns0rhRGtaAtQPaK9dV3wTEebYq0x KRGyZDxie78HJOSRgiNgQIKUYDy6JHTW052BitC59+aPeo7/tptCWNkpe/xQpOQ5+T3f DSCzSv2Cet1r54JYCNCTLWY5YT6R9RyPLl9uAFTcC+3R2wxHp4d1IULQbsxpU67BK3YF FgMg7DfnzlxOBU5AdyP0Vf+3qXHm3lhqdgTl5ontzZYFqQhBmsQAOu9uzWyRnoggK3af 0DVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:from:to:cc:references:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=MCp5gkbqKS0RvZFKzFKSNuHoKmiCM0Epn/XAc+RYQ90=; b=TzV8fjGss+DL2vb5uKoXikgbu0bCrNy3rZpGVJI+8jKBD4SkTxL/8GKIcNflTWocZ4 wVjxQVtP+C8wxzVMgLQGF+anyOA+qfhmMwEkp1s96TJQ0w+RE20A5fThytOyXFnvxD1a mQ6ltnxar8yssrWexMaGAvZMmFVras9VjpUXCYpLWshL80hM0m74yyvlLaDfbOr9dz1T hV1Ik9f5TtwV2UKRdfB8+WsTmA7kIe1FR0t1CKcr0A03QBdIb5KGKwP8afSYWuDJOMFg LzWd2f8i1QCY0sXR4que7jOFIXTb6kcM+OfJCb5ScMHvwmb7zaskH7NvaVLpsZJvKFwF LUTw== X-Gm-Message-State: AOAM530s7D/H4whtER3Ty39VxeB4xs1S1UyGTFdr07h976UQAMlDNpbU Yd765wZYZNqYjSJVwOdXE1y+8+i0WkU= X-Google-Smtp-Source: ABdhPJz82PM8Cn12nTwk3rMlEpftB8sJLR3O8MfMoDDQ5s/H6w16Rf/BzYJVC59OtkO1N9Ho/0t4nQ== X-Received: by 2002:a5d:456b:: with SMTP id a11mr17526045wrc.121.1642382248555; Sun, 16 Jan 2022 17:17:28 -0800 (PST) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id c3sm9192592wme.35.2022.01.16.17.17.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 16 Jan 2022 17:17:28 -0800 (PST) In-Reply-To: <921c0b69-7bac-b78a-54d8-987165331661@yandex.ru> Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=raaahh@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:284856 Archived-At: On 17.01.2022 02:19, Dmitry Gutov wrote: > As far as I'm concerned, it might as well use > read-regexp-defaults-function. But the implementation is made more > complicated by the fact that read-regexp and read-from-minibuffer treat > their PROMPT and DEFAULTS arguments differently. > > E.g. the latter won't return DEFAULT-VALUE on empty input and won't > format the prompt. If I use read-string instead, it uses the default > value instead of empty input, but does not format the prompt still. So, this seems to work, but I wonder if it's the best we can do: diff --git a/lisp/replace.el b/lisp/replace.el index 60e507c642..9847e4ebea 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -234,7 +234,10 @@ query-replace-read-from (symbol-value query-replace-from-history-variable))) (minibuffer-allow-text-properties t) ; separator uses text-properties (prompt - (cond ((and query-replace-defaults separator) + (cond ((and regexp-flag read-regexp-defaults-function) prompt) + (read-regexp-defaults-function + (format-prompt prompt (funcall read-regexp-defaults-function))) + ((and query-replace-defaults separator) (format-prompt prompt (car minibuffer-history))) (query-replace-defaults (format-prompt @@ -255,10 +258,17 @@ query-replace-read-from (append '((separator . t) (face . t)) text-property-default-nonsticky))) (if regexp-flag - (read-regexp prompt nil 'minibuffer-history) - (read-from-minibuffer - prompt nil nil nil nil - (query-replace-read-from-suggestions) t))))) + (read-regexp + (if read-regexp-defaults-function (string-remove-suffix ": " prompt)) + read-regexp-defaults-function + 'minibuffer-history) + (read-string + prompt + nil nil + (if read-regexp-defaults-function + (funcall read-regexp-defaults-function) + (query-replace-read-from-suggestions)) + t))))) (to)) (if (and (zerop (length from)) query-replace-defaults) (cons (caar query-replace-defaults)