From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gabriel Newsgroups: gmane.emacs.bugs Subject: bug#47286: 28.0.50; [PATCH] Replace "(default %s)" with 'format-prompt' Date: Sun, 21 Mar 2021 21:03:15 -0300 Message-ID: References: <87o8fc1p1q.fsf@gmail.com> <2454249f-5987-8f04-a58e-0596f572bb0e@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6070"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) To: 47286@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 22 01:04:11 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 1lO83G-0001SO-Ui for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 Mar 2021 01:04:11 +0100 Original-Received: from localhost ([::1]:60906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO83F-0000QZ-V1 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 21 Mar 2021 20:04:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO838-0000QN-II for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2021 20:04:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lO838-0006Bv-At for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2021 20:04:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lO838-00061p-5t for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2021 20:04:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Gabriel Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 Mar 2021 00:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47286 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.161637141123135 (code B ref -1); Mon, 22 Mar 2021 00:04:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Mar 2021 00:03:31 +0000 Original-Received: from localhost ([127.0.0.1]:55715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO82c-000615-MC for submit@debbugs.gnu.org; Sun, 21 Mar 2021 20:03:30 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:34282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO82Y-00060u-Gb for submit@debbugs.gnu.org; Sun, 21 Mar 2021 20:03:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO82X-0000OS-Pg for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2021 20:03:26 -0400 Original-Received: from mail-mw2nam10olkn2104.outbound.protection.outlook.com ([40.92.42.104]:3810 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO82V-0005vR-Rb for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2021 20:03:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QhZ3l6wmk5oYaV3cOH1tcH9ZrzDw7CvHVSLmWCOuCQSpH6FDkx+H862wn+G5ex/VxGP0QX1l48KExC4DkJiZ87sJhi4yhgk42WvvZadbcG2CYkw80v6YH6Tl7ECXfPDK3I6rTL8gXmFJ1CJ0w3Dfmom9QbiRR9HqIAvEWsIVyllMhMFUChsS5RMz8Hwju00uc7PEgPo2NSaP2WFqdxP1NH5O9h9YQHAZEd6iyTsIzt6RXvR0cGK/y+n+vuXGpUSUAOM6LwbncIl1wcFakSAbhKS+L3Zf1G6/ftgTsMakXQjJ6jkzPFu9JavOmlBFFmct3DuZmKdm2yca6HYmDoNG8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kF8VusoktH2VROaBO6Jo6pFr89EOJIQ2TxpM4OMqc3U=; b=ggMwlVYPskdPD7i1Qpj0c1x80omo4WtlRRT0Z7ppIUDJQxXrpzR/WqMU9/sHYbWAdQ21tdcz1eUKOO/j723LWwvkxA4CedItfm7qmw88HbwNjBfTZ09re3ESrvb/YDE6aCX94LBzfjunr2y2rCxwgYV1WMw6q5IL6SjOweGQBZjzzqZ4I2ID/VDLIAaj5FZJXX41p+YOsI4+DfVDx17vquVnwjMX0AFGLwEMx/xb9+HLzX/3OebgoGl4DBviOCGFxZQyj+LPzP8YwvNg7a7N2fgN/ngcHP8oJ7UaQZRJVUAs/yLGBTrpj7GVCdSQ/AbmvMS6PqIclw3y4jtrmFGzyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kF8VusoktH2VROaBO6Jo6pFr89EOJIQ2TxpM4OMqc3U=; b=FKNFb+haJsUWwzcncVPTRgHkZyPUm0Fl1nKfAFZcgKz4sn7g6kPmMy2cpDIy61UwioaPbwhzGUzh3C8qSiI0noMf9W8uz1Q0iqZ+Hq5TkwLXoL1tIj/6AD8+VOZYAsLNEPFD4BuiqZwWNXq5Jmno0zSe0U8ZcLMFrtrKCvHkfZlBanywnTVhJnwh8pFKRd65BlCZiDO9I/NsTasmudkffx5EKZRicdCrgis6TCgYXn2dOQnsoAF4sLowtMXUyFR44r/fBPFtC6SnuZe/uLL+LxmUNyIfcB7Mhr0W0zrB+MHGKlmkO0y1NVp2YdaOe0tQrK8HQmIkNMo5ybMzJctKSA== Original-Received: from MW2NAM10FT024.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e87::42) by MW2NAM10HT100.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e87::312) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Mon, 22 Mar 2021 00:03:21 +0000 Original-Received: from CH2PR01MB5879.prod.exchangelabs.com (2a01:111:e400:7e87::44) by MW2NAM10FT024.mail.protection.outlook.com (2a01:111:e400:7e87::455) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Mon, 22 Mar 2021 00:03:21 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:26D1AD210F532D607E14F9FC12BE2850047E5AC304B447B42B78053C2C0BA924; UpperCasedChecksum:346B7EDEF51D945A44C50F056C5D2A1DD5174187DE33352BEF2B4681FDC18AAD; SizeAsReceived:7683; Count:45 Original-Received: from CH2PR01MB5879.prod.exchangelabs.com ([fe80::592f:9a58:d8cd:d9c9]) by CH2PR01MB5879.prod.exchangelabs.com ([fe80::592f:9a58:d8cd:d9c9%7]) with mapi id 15.20.3955.025; Mon, 22 Mar 2021 00:03:20 +0000 In-Reply-To: <2454249f-5987-8f04-a58e-0596f572bb0e@yandex.ru> (Dmitry Gutov's message of "Sun, 21 Mar 2021 20:57:04 +0200") X-TMN: [Er6CnTtOVGtWo2gMyxFLSZDsIOpbBvBSGwYOPtGfR16gOueerkBDW0t+TOlwwfHD] X-ClientProxiedBy: CP3P284CA0107.BRAP284.PROD.OUTLOOK.COM (2603:10d6:103:6f::22) To CH2PR01MB5879.prod.exchangelabs.com (2603:10b6:610:3c::12) X-Microsoft-Original-Message-ID: <87r1k8qcl8.fsf@hotmail.com> X-MS-Exchange-MessageSentRepresentingType: 1 Original-Received: from precision5540 (2804:431:c7f3:ee67:60a0:ed63:b5e6:b5cb) by CP3P284CA0107.BRAP284.PROD.OUTLOOK.COM (2603:10d6:103:6f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Mon, 22 Mar 2021 00:03:19 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e4863f2a-a358-4654-638b-08d8ecc5e6f2 X-MS-TrafficTypeDiagnostic: MW2NAM10HT100: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e5SSOYNatvHPfiwn1veWG+fgcF2tF1wgts8D85ni2diG2q09z673tgHK88+SibbWUXZ+stVuLlL/q8yQZjtR7Y7Q1E1etTLFDnAFmlc+/rNBYC3T1n0vh71BYfbygXzWuj+rDU6IqV25rT+szYmE1g5ojzFN55d4KvrhKThwdv+eO+/viQGgICJ6w0zQ92Ong1fDFz3ncx8qLfLRZRcjCC3PkOSQG0IzAXj7wb6mbr1Mp7L/dpa2ONmp5B9llz9XXRgi5TugFfmxph/AtAJiAGdCJL6MbGx/+m4p9hFe4YV9bkkTxToVaeqg6lr4F+56Xnrdeol+Mtw6UapfwtZYQ+dfkDsQXOHexi65fb4+L76HzMUwQXIR2+8WbNG3/5TqgbQp3ncVxPNGCfLa6y496Q== X-MS-Exchange-AntiSpam-MessageData: bqOZSs2PwaDSkIlhNNt7MQX0a6QVwksGPUJSKV2UIC1xxRSdlpvu6rg/TQ3iH2pNJ47SNEwgicg7BZzqXg7naOY8Fv0SJEqb/6LGaxY9+BbWZ690vXOhJhUMOyt3H487Xc/0cdTRe1nKTfoBx6EuYvUR0of4GB3btmF0m9GsYV0RIm2MZeObZuxsi7Uo9ZEcw0KN6oQKKw5exCUAVxaTRg== X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4863f2a-a358-4654-638b-08d8ecc5e6f2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2021 00:03:20.6169 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: MW2NAM10FT024.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2NAM10HT100 Received-SPF: pass client-ip=40.92.42.104; envelope-from=gabriel376@hotmail.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:202814 Archived-At: Dmitry Gutov writes: > Also note that project--completing-read-strict includes as (string-equal default > "") check added in 2be537e64. > > Perhaps format-prompt could use it as well. Do you mean to add a new check to 'format-prompt' to consider an empty DEFAULT as nil, e.g., to not show it on minibuffer prompt in case the value of the DEFAULT argument is an empty string ? Also, maybe another useful check for 'format-prompt' would remove the ": " suffix from the PROMPT argument, to avoid displaying something like "prompt: : ", which could avoid regressions when migrating existing code. Example of the new 'format-prompt': (defun format-prompt (prompt default &rest format-args) "Format PROMPT with DEFAULT according to `minibuffer-default-prompt-format'. If FORMAT-ARGS is nil, PROMPT is used as a plain string. If FORMAT-ARGS is non-nil, PROMPT is used as a format control string, and FORMAT-ARGS are the arguments to be substituted into it. See `format' for details. If DEFAULT is a list, the first element is used as the default. If not, the element is used as is. If DEFAULT is nil or an empty string, no \"default value\" string is included in the return value." (let* ((suffix ": ") (prompt (if (string-suffix-p suffix prompt) (substring prompt 0 (* -1 (length suffix))) prompt)) (default (if (equal "" default) nil default)) (formatted-prompt (if (null format-args) prompt (apply #'format prompt format-args))) (formatted-default (and default (format minibuffer-default-prompt-format (if (consp default) (car default) default))))) (concat formatted-prompt formatted-default suffix)))