From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.bugs Subject: bug#12443: 24.2.50; Default values in the minibuffer prompt (fix Date: Sun, 17 Jan 2021 19:05:06 +0000 Message-ID: <875z3vxu3h.fsf_-_@tcd.ie> References: <871ui48di4.fsf@mail.jurta.org> <878se2aox0.fsf@gnus.org> <87imd669dh.fsf@gnus.org> <875z961u2l.fsf@mail.linkov.net> <871rjt1uc1.fsf@gnus.org> <878se0gc25.fsf@mail.linkov.net> <87imd2vp1k.fsf@gnus.org> <87sgbv7xtn.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33861"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 12443@debbugs.gnu.org, Stefan Kangas , Stefan Monnier , Dani Moncayo To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jan 17 20:06:14 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1l1DNN-0008dh-Qk for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 17 Jan 2021 20:06:13 +0100 Original-Received: from localhost ([::1]:40872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1DNM-00054W-CS for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 17 Jan 2021 14:06:12 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1DNC-00052x-R2 for bug-gnu-emacs@gnu.org; Sun, 17 Jan 2021 14:06:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1DNC-0006yA-Ju for bug-gnu-emacs@gnu.org; Sun, 17 Jan 2021 14:06:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1DNC-0002H1-FX for bug-gnu-emacs@gnu.org; Sun, 17 Jan 2021 14:06:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Jan 2021 19:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12443 X-GNU-PR-Package: emacs Original-Received: via spool by 12443-submit@debbugs.gnu.org id=B12443.16109103168683 (code B ref 12443); Sun, 17 Jan 2021 19:06:02 +0000 Original-Received: (at 12443) by debbugs.gnu.org; 17 Jan 2021 19:05:16 +0000 Original-Received: from localhost ([127.0.0.1]:45670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1DMS-0002Fz-Eu for submit@debbugs.gnu.org; Sun, 17 Jan 2021 14:05:16 -0500 Original-Received: from mail-wm1-f53.google.com ([209.85.128.53]:36345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1DMQ-0002Fl-Pw for 12443@debbugs.gnu.org; Sun, 17 Jan 2021 14:05:15 -0500 Original-Received: by mail-wm1-f53.google.com with SMTP id v184so7802771wma.1 for <12443@debbugs.gnu.org>; Sun, 17 Jan 2021 11:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=cO6EFgDCHnGFdqLLG1UdrRPh9VsW5m8xXgukXyBSUzI=; b=cHIyZx9UOdi8BykNj0KIHAivgK1tBZjSL3ixBlWCVmtRC3m5H5C27fCcNtLiltUAZs UYba2YXb6FNG/T9fD+pirShKKpMtVzZcmRrvN+XKxxmZahR1wyhe9MIxe/3oixspw1Nm Rvwci27BY5jYFqJ9rToFshAQpgC806DSgxxcn7HHBSWZZNRx8XbR+2pavKQlnwe6HR0d QNWtwH6feuY9QPgiR7uxOakw1DMllqF8UmDN1Vs3QqmfR0G6iLxhN9wrzqPyRYEs6Ued v6+iJY2njSIYWBV+HtVKItp+z8tgxOeXRFUP0VsxUGZlOYE4+6x/3qw6x1Grsj+1/sYb AWwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=cO6EFgDCHnGFdqLLG1UdrRPh9VsW5m8xXgukXyBSUzI=; b=dDbdV+sC5BVdkWRolFVAzJRCjpvWPeBHg+1vaspsksg0/MzsEMzATcRKNJI1ehxxkN 4lwxDpuwcTru7qk2D1ravFvD1xSqdMCwGlh+HHVw5qCTUzcmky9zfctoNH7sXBTWC0+l bKpUpmXkuaE4o7um247WhHeOjDWM/por/5XiyE4Eo/kb2HWYh7o4gpVvJ8Z2ZtCiUxqX n2jMcMf85vb8sRXPw2S2ZENYmqmI0/dnLsIbOezfvoFu/cYN1APgRU4ZMNzxywjLupmg 96xTqIT2pD+jlLOQPZsbd0NDMzkUYSOlJJDfvT3JCyHh068aKqR04YUku4MKWdsonRLK JegA== X-Gm-Message-State: AOAM530vL/+/J005PVGPrEHudNFWeCBWybzNYxydiJiTwVcBTlxzNWod JG5nCdOsBZdVwCp4ed7JDQbSAg== X-Google-Smtp-Source: ABdhPJzDKF6jFIFPiCmQMaGbrE8zRCBnunOjx14Vn+DrS9G9sZ0gPl3TsJaFrd8mLJ2y57TGkDuyTg== X-Received: by 2002:a05:600c:268b:: with SMTP id 11mr6427744wmt.132.1610910309301; Sun, 17 Jan 2021 11:05:09 -0800 (PST) Original-Received: from localhost ([2a02:8084:20e2:c380:f410:82e8:3a21:eedf]) by smtp.gmail.com with ESMTPSA id c10sm27728806wrb.92.2021.01.17.11.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 11:05:08 -0800 (PST) In-Reply-To: <87sgbv7xtn.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 06 Sep 2020 17:02:28 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198062 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > OK, the first sweep has now landed on master (I basically grepped for > " (default %" and then did the changes. Boy, were there many different > ways to "optionally add some defaults" in the code... > > 78 files changed, 316 insertions(+), 453 deletions(-) > > Look at all the lines saved! :-) > > There's also some of the prompting functions that have some support for > this general idea, but in different ways: > > (defun read-regexp (prompt &optional defaults history) > [...] > (input (read-from-minibuffer > (cond ((string-match-p ":[ \t]*\\'" prompt) > prompt) > ((and default (> (length default) 0)) > (format "%s (default %s): " prompt > (query-replace-descr default))) > (t > (format "%s: " prompt))) > nil nil nil (or history 'regexp-history) suggestions t))) Any reason this function wasn't changed in the end? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Use-format-prompt-in-read-regexp.patch >From 3d3423ef6705cf157e279c95e5eb8a35b8ca78fb Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Sun, 17 Jan 2021 18:56:50 +0000 Subject: [PATCH] Use format-prompt in read-regexp. * lisp/replace.el (read-regexp): Use format-prompt (bug#12443). --- lisp/replace.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lisp/replace.el b/lisp/replace.el index d41dc98a0d..8f8cbfac54 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -866,13 +866,10 @@ read-regexp ;; Do not automatically add default to the history for empty input. (history-add-new-input nil) (input (read-from-minibuffer - (cond ((string-match-p ":[ \t]*\\'" prompt) - prompt) - ((and default (> (length default) 0)) - (format "%s (default %s): " prompt - (query-replace-descr default))) - (t - (format "%s: " prompt))) + (if (string-match-p ":[ \t]*\\'" prompt) + prompt + (format-prompt prompt (and (length> default 0) + (query-replace-descr default)))) nil nil nil (or history 'regexp-history) suggestions t))) (if (equal input "") ;; Return the default value when the user enters empty input. -- 2.29.2 --=-=-= Content-Type: text/plain -- Basil --=-=-=--