From unknown Sat Jun 21 12:12:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73412: 31.0.50; Improve sql-read-product Resent-From: Stephen Berman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Sep 2024 14:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73412 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 73412@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172692916413353 (code B ref -1); Sat, 21 Sep 2024 14:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Sep 2024 14:32:44 +0000 Received: from localhost ([127.0.0.1]:40118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1AB-0003TI-CZ for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:32:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:56810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1A9-0003T9-Dn for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss19o-0006ZE-D1 for bug-gnu-emacs@gnu.org; Sat, 21 Sep 2024 10:32:20 -0400 Received: from mout.gmx.net ([212.227.15.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss19m-0001pg-MG for bug-gnu-emacs@gnu.org; Sat, 21 Sep 2024 10:32:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1726929137; x=1727533937; i=stephen.berman@gmx.net; bh=8AsaJ1mViWuZvRs1kd94ELs+WW/u5zDTsDZdC5Y84s0=; h=X-UI-Sender-Class:From:To:Subject:Date:Message-ID:MIME-Version: Content-Type:cc:content-transfer-encoding:content-type:date:from: message-id:mime-version:reply-to:subject:to; b=ESQ9k+muzYVM2aeWkF4TtCdL40401Hqdv9rpgHLPsReKjhjApCYD+WJqbKy2C0U0 KVFDrQkw40z1bgB9ZtJd3t1Mhdm9o1J3GN+YXyRD3ySFneySKU8D+az2kmdRiHSiQ OW3p1+/DxChfgS5R3eTfTgwjsqbJvyiYojmdXVEb51Pd4Z/4xU+z5cVj7gADtMuhG BRgiLCxol0XGnQj/hUMM2mtTDZPiLMWoMSCd9nEiK0BWI/qr9RODtlto9cEpfbDKR 6PFxxER6Ki3bZCNuu9CC8e+/fxWOmNNxhJ4opU0VBDUo2tOSNuJVA/rAfMzsVOoG6 FpuSqTl/0pgRVGEUHA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from strobelfssd ([88.130.49.45]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M2wL0-1soiJ30VZM-00AFrq for ; Sat, 21 Sep 2024 16:32:17 +0200 From: Stephen Berman Date: Sat, 21 Sep 2024 16:32:16 +0200 Message-ID: <874j69nklr.fsf@gmx.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:6XgXqByIXHjwPClLi2hrmgRgNQk+HjDztTvSYu9quDxyTI/1xIJ LIdypnlBUkdDLEzaX4OBPrSQSfgxe+66OD/FJ24FyyROj1GuZEZp9aU3Ho+MjeSktBQEGYv HCAU245o+rppy2fV+yWU318yehRfpz5W9dUyhshgclQF1aC/pw38yKNieBsjlriPdgicbui csLxZaxb4FpRieI/4UkXw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:M86nkUN7FAk=;Qq8oK3KC/enauIF9f4VIsv/yzLP JESw/bXTVt/7iyAsK2DmVi1P9PvPY7BzARScraqirSZ+jonf4RStF1CuRMZ/bZm8eM+f2q+Ai RBhPEZuT06ljJwYfdxK6Br1DYdnKNdRK9xWD/cT/LN5UU3T7JUyxPT6JdeLWGfS9PDYKBWW79 Sdj0uMdZyhiJ4mmB9O4ze06k4424WwmfXcVjDR9HOf4+sO5/rWT79rvDq3PQSVZRwY55vJO6R OMGdglHbgWuo5SJxUMs+S/6PYZA/mvcSN5oRlRCMDXhuc+8r58uJrSgQ6x8kHqUcwW+m6idEP JeRKSZ0gLw867/Voh+conNSpkY5F43d8UmzpIfyVsTAEVmabZ9t4YqALcOIpejT4uDoMMIT9c QTo5G9mF9jmn7LSeTpAcSXgVLNCaxH09thLn0RxEQyvd39opU4ty9t6lV3F5+IL7HoIlkWebQ oenIVyzgT2suQjldPEYSrvrREHCSxt1oqhlppwrMywbsBNx/LTxfjeWT6EYeDbcF6P4XK5irz Go2Mybsu3Pfol9aDM4O0WznAGRuVO0tLuBEYV/piRkFkz8vVe3cVrP+Tt3nWWVyes6LdJJCAS ApLadvIzb99Wom5z6n5xFm/vmKcia1/GxBCsVGqEDCyQJRbyNzSQUCJiuLmCqXXt2RL5KKdRE m/EFOxEAhmGCJNxo2lqPQ/Y776DHDwdipb+DVqomDoSoTA1BFqmTWqFu6nrBlyLEkzRC6XYMe rxfcP9Jq0f4r6ctCuZohJRmqb67g5nlcRzPl2xQAP9RT74j+E/wFSrVPqkBuPV+aP6nqWiXeH NpKzyydSWcdUz9eXoaKBMShQ== Received-SPF: pass client-ip=212.227.15.19; envelope-from=stephen.berman@gmx.net; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain 0. emacs -Q 1. C-u M-x sql-product-interactive RET Now the minbuffer displays the following: SQL product: ansi so it you want to change the product, e.g. to postgres, you first have to delete "ansi". Likewise, `M-x sql-set-product RET' produces the same minbuffer display, requiring deletion to change the product. The reason "ansi" is displayed after the prompt is that the definition of sql-read-product uses the same non-nil value of the deprecated argument INITIAL-INPUT as is used for the argument DEF. The attached patch makes INITIAL-INPUT nil, thus using only DEF, and also wraps the prompt argument of sql-read-product in format-prompt, so the default value is shown as part of the prompt and changing it does not require deletion. The patch also adjusts the two callers of sql-read-product accordingly. In GNU Emacs 31.0.50 (build 3, x86_64-pc-linux-gnu, GTK+ Version 3.24.43, cairo version 1.18.2) of 2024-09-12 built on strobelfssd Repository revision: 31e8500b061b6963708e66468fc89db1006226d7 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101013 System Description: Linux From Scratch r12.2-5-systemd Configured using: 'configure -C 'CFLAGS=-Og -g3'' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG LCMS2 LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB --=-=-= Content-Type: text/x-patch Content-Disposition: attachment Content-Description: sql-read-product patch Content-Transfer-Encoding: quoted-printable diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 5273ba2bee1..a0b350ce54f 100644 =2D-- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -2666,11 +2666,11 @@ sql-read-product "Read a valid SQL product." (let ((init (or (and initial (symbol-name initial)) "ansi"))) (intern (completing-read - prompt + (format-prompt prompt init) (mapcar (lambda (info) (symbol-name (car info))) sql-product-alist) nil 'require-match - init 'sql-product-history init)))) + nil 'sql-product-history init)))) (defun sql-add-product (product display &rest plist) "Add support for a database product in `sql-mode'. @@ -2912,7 +2912,7 @@ sql-highlight-product (defun sql-set-product (product) "Set `sql-product' to PRODUCT and enable appropriate highlighting." (interactive - (list (sql-read-product "SQL product: "))) + (list (sql-read-product "SQL product"))) (if (stringp product) (setq product (intern product))) (when (not (assoc product sql-product-alist)) (user-error "SQL product %s is not supported; treated as ANSI" produc= t) @@ -4546,7 +4546,7 @@ sql-product-interactive (setq product (cond ((=3D (prefix-numeric-value product) 4) ; C-u, prompt for produc= t - (sql-read-product "SQL product: " sql-product)) + (sql-read-product "SQL product" sql-product)) ((assoc product sql-product-alist) ; Product specified product) (t sql-product))) ; Default to sql-product --=-=-=-- From unknown Sat Jun 21 12:12:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73412: 31.0.50; Improve sql-read-product Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Sep 2024 15:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73412 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stephen Berman Cc: 73412@debbugs.gnu.org Received: via spool by 73412-submit@debbugs.gnu.org id=B73412.172693209424153 (code B ref 73412); Sat, 21 Sep 2024 15:22:02 +0000 Received: (at 73412) by debbugs.gnu.org; 21 Sep 2024 15:21:34 +0000 Received: from localhost ([127.0.0.1]:40208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1vR-0006HV-ST for submit@debbugs.gnu.org; Sat, 21 Sep 2024 11:21:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1vQ-0006HA-Hw for 73412@debbugs.gnu.org; Sat, 21 Sep 2024 11:21:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss1v0-0004MR-EI; Sat, 21 Sep 2024 11:21:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=eXIg6dwo7yg/70Oy9H+g8g7qvbGAjLqgDAwVfnsgxP0=; b=q6tU4jDuasPh 2mcO0+L7S9QgM90h06C9R1Q9xCXAa46jtSN9ObxD7K2PTHWcaqxlZbtuXxZkLHV09ybY2hlNPtWWx zP/brVH1YS6UOItD7otIe0VNbsa9ctzwcP/rM1kBpsfZRJ+0veNxqNgK417LdaFzD0JZjt95oEmq1 lF98428q4V94j6Xq5bOPrmS4akRdOZa2OcI2ed+i06UtZsAqkNyZPHfAMKrTW+9u30OJLDRR409Yp CBUg1FQmNtBSMpTgacF5akT4kCuV6mNdDYZwxk6/TiWgL/GZ8OPbanHswEKTz+WpyO7RmdIuRoYpM RxDYBY2I3HEgCMFPc+dlhA==; Date: Sat, 21 Sep 2024 18:21:03 +0300 Message-Id: <86o74h2fts.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <874j69nklr.fsf@gmx.net> (bug-gnu-emacs@gnu.org) References: <874j69nklr.fsf@gmx.net> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Sat, 21 Sep 2024 16:32:16 +0200 > From: Stephen Berman via "Bug reports for GNU Emacs, > the Swiss army knife of text editors" > > 0. emacs -Q > 1. C-u M-x sql-product-interactive RET > > Now the minbuffer displays the following: > > SQL product: ansi > > so it you want to change the product, e.g. to postgres, you first have > to delete "ansi". > > Likewise, `M-x sql-set-product RET' produces the same minbuffer display, > requiring deletion to change the product. > > The reason "ansi" is displayed after the prompt is that the definition > of sql-read-product uses the same non-nil value of the deprecated > argument INITIAL-INPUT as is used for the argument DEF. The attached > patch makes INITIAL-INPUT nil, thus using only DEF, and also wraps the > prompt argument of sql-read-product in format-prompt, so the default > value is shown as part of the prompt and changing it does not require > deletion. The patch also adjusts the two callers of sql-read-product > accordingly. Thanks. I think this should go to the emacs-30 branch, no? From unknown Sat Jun 21 12:12:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Stephen Berman Subject: bug#73412: closed (Re: bug#73412: 31.0.50; Improve sql-read-product) Message-ID: References: <87zfo0n41p.fsf@gmx.net> <874j69nklr.fsf@gmx.net> X-Gnu-PR-Message: they-closed 73412 X-Gnu-PR-Package: emacs Reply-To: 73412@debbugs.gnu.org Date: Sat, 21 Sep 2024 20:31:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1726950662-24157-1" This is a multi-part message in MIME format... ------------=_1726950662-24157-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #73412: 31.0.50; Improve sql-read-product which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 73412@debbugs.gnu.org. --=20 73412: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73412 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1726950662-24157-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 73412-done) by debbugs.gnu.org; 21 Sep 2024 20:30:25 +0000 Received: from localhost ([127.0.0.1]:40378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss6kL-0006Ao-Gs for submit@debbugs.gnu.org; Sat, 21 Sep 2024 16:30:25 -0400 Received: from mout.gmx.net ([212.227.15.15]:41139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss6kK-00068V-8f for 73412-done@debbugs.gnu.org; Sat, 21 Sep 2024 16:30:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1726950597; x=1727555397; i=stephen.berman@gmx.net; bh=wXbzNcsu+sgetIyaUGVnvQIuPwJjiKVtOX9wk+IoTpo=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=PnrOx9TWVwEiwLtd8OILPEXz/+ihY4CiAUCZo0Wl9N1iYCg3ALDUl3kGZTH3RsVw C0qSBktQBv93OD0RBxz/CqH0vTSz8iqlAcvBdGVyznD8W4u5vtFGTsRMClAjlSwjZ fyJTcRRR5BL/+2wyZWtKuDoaUn8B5Wod6LHQT/mPPOi+8p4+x8JcVM8BpyEv9so2L QksKYAmueQM1gPkSAQFwCwvshXyCWoU8maRNvAM/i20y6HWxh8EyPrj4VHlKWFx4e 4ns7aUueFdG7fyxE7qNAtvan2eCgOUf7S9Nba8908ncnrPOeC2DZbS60LEM4UAQhw EhtsoIg2dkt8jA9N3w== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from strobelfssd ([88.130.49.45]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MWics-1sTx643b44-00IlxB; Sat, 21 Sep 2024 22:29:56 +0200 From: Stephen Berman To: Eli Zaretskii Subject: Re: bug#73412: 31.0.50; Improve sql-read-product In-Reply-To: <86o74h2fts.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 Sep 2024 18:21:03 +0300") References: <874j69nklr.fsf@gmx.net> <86o74h2fts.fsf@gnu.org> Date: Sat, 21 Sep 2024 22:29:54 +0200 Message-ID: <87zfo0n41p.fsf@gmx.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:hqLW6Li79iipFzzXNi11LLZbCKJt9cVtxREeJBJ7+NUzlk+DnJr zWPZrxlEeTNmLQaRCbflbGObs8ONIBo7neUIPIJVQpVl2MQH0trDSZIZlPkCIbW3aa6R7ry POrqeQLZs2nX5H+tB6ktCSFhqfGMjX8buSG3UX/xDCGndniU5EpGSlDCLF8bbvraWn6Kuk4 voOpADW0G/OUFLP00D8lw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:NH15t3mxBMQ=;0x+yG5ySyPPbXLHPtwDqQZNBn7f xG2xUUiHKnelvsqTMR7eC7VISGQo9odwkDa2ktGb9L/YjkdkWPW2R9bz4XnV0/odIA2IIVZoC esvQPv+pCjb5q9oi1qoEq26sLTlGgTA9RaQ5FiYWK6DbEbSI12le/A1qZHI2urfUJirM23hE4 c21x8NAU/bwPy1gO7U/gsMLw8nupwtu7gpIxms1Xra1yP0guZrP0ku6Zqyzz11buGnVgUbfTu 3kdj4bUoYkpieRCkAUTm3cqDlFob5pK5kXmXuMthxCpArB5ZeQ4lfCw/6Qloxl+yGDZhb4T3A sCez08Wl5VifoBfV12hY2kznnmS0/dYwJsCqpJtMU5+izRjJCmbwWA3Lr7E2IEDcw78gHyf9l aN0blfONKStfl/NRe1OmFq76E0D5tbEmIkFahVh8okfQV33EPO94Y8897H06qLNBN06f9W/pb n4Z2C4LkUhA9ZjXAY75TkjOGCrn98vCe0nq1EcqDjMtsi38WqeDN9JTRjEk++Ws2p6Zk/ocYL XkmoXpW5FeQ+Zm0G9cfGwTDy2rSwpofuerG0J4pmCtDMNr6DTQly0Aep559CJm9v3aPOlMn+7 k4fdJxjxiJn2JHfOrhXBIZBOfADzrc/ck0Jj0Yl5QW4K2izfbwuzeWuoDzFwCE7BZk6B3TobH elUO9HRNmW1OpLySUJci/CIdmum0H+7ygZxadFOE9D8qdSfgiP7pMBmMxt6GXo2hSdLLdQe6r ubptYFq/wS99nuXyG/MgWausgR1CsWV/NUYbqoxucDf8wKgIue8bMYhdBFFwEbGePJ07OgPwF 6sLSwLDIg3MCQzJiahSPAjMA== Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73412-done Cc: 73412-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 21 Sep 2024 18:21:03 +0300 Eli Zaretskii wrote: >> Date: Sat, 21 Sep 2024 16:32:16 +0200 >> From: Stephen Berman via "Bug reports for GNU Emacs, >> the Swiss army knife of text editors" >> >> 0. emacs -Q >> 1. C-u M-x sql-product-interactive RET >> >> Now the minbuffer displays the following: >> >> SQL product: ansi >> >> so it you want to change the product, e.g. to postgres, you first have >> to delete "ansi". >> >> Likewise, `M-x sql-set-product RET' produces the same minbuffer display= , >> requiring deletion to change the product. >> >> The reason "ansi" is displayed after the prompt is that the definition >> of sql-read-product uses the same non-nil value of the deprecated >> argument INITIAL-INPUT as is used for the argument DEF. The attached >> patch makes INITIAL-INPUT nil, thus using only DEF, and also wraps the >> prompt argument of sql-read-product in format-prompt, so the default >> value is shown as part of the prompt and changing it does not require >> deletion. The patch also adjusts the two callers of sql-read-product >> accordingly. > > Thanks. > > I think this should go to the emacs-30 branch, no? I agree and did so in commit c1f2501f55d and am closing the bug. Since this is a minor UI update and improvement with no change in functionality I assume it does not need to be called out in NEWS, right? Steve Berman ------------=_1726950662-24157-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Sep 2024 14:32:44 +0000 Received: from localhost ([127.0.0.1]:40118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1AB-0003TI-CZ for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:32:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:56810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1A9-0003T9-Dn for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss19o-0006ZE-D1 for bug-gnu-emacs@gnu.org; Sat, 21 Sep 2024 10:32:20 -0400 Received: from mout.gmx.net ([212.227.15.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss19m-0001pg-MG for bug-gnu-emacs@gnu.org; Sat, 21 Sep 2024 10:32:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1726929137; x=1727533937; i=stephen.berman@gmx.net; bh=8AsaJ1mViWuZvRs1kd94ELs+WW/u5zDTsDZdC5Y84s0=; h=X-UI-Sender-Class:From:To:Subject:Date:Message-ID:MIME-Version: Content-Type:cc:content-transfer-encoding:content-type:date:from: message-id:mime-version:reply-to:subject:to; b=ESQ9k+muzYVM2aeWkF4TtCdL40401Hqdv9rpgHLPsReKjhjApCYD+WJqbKy2C0U0 KVFDrQkw40z1bgB9ZtJd3t1Mhdm9o1J3GN+YXyRD3ySFneySKU8D+az2kmdRiHSiQ OW3p1+/DxChfgS5R3eTfTgwjsqbJvyiYojmdXVEb51Pd4Z/4xU+z5cVj7gADtMuhG BRgiLCxol0XGnQj/hUMM2mtTDZPiLMWoMSCd9nEiK0BWI/qr9RODtlto9cEpfbDKR 6PFxxER6Ki3bZCNuu9CC8e+/fxWOmNNxhJ4opU0VBDUo2tOSNuJVA/rAfMzsVOoG6 FpuSqTl/0pgRVGEUHA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from strobelfssd ([88.130.49.45]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M2wL0-1soiJ30VZM-00AFrq for ; Sat, 21 Sep 2024 16:32:17 +0200 From: Stephen Berman To: bug-gnu-emacs@gnu.org Subject: 31.0.50; Improve sql-read-product X-Debbugs-Cc: Date: Sat, 21 Sep 2024 16:32:16 +0200 Message-ID: <874j69nklr.fsf@gmx.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:6XgXqByIXHjwPClLi2hrmgRgNQk+HjDztTvSYu9quDxyTI/1xIJ LIdypnlBUkdDLEzaX4OBPrSQSfgxe+66OD/FJ24FyyROj1GuZEZp9aU3Ho+MjeSktBQEGYv HCAU245o+rppy2fV+yWU318yehRfpz5W9dUyhshgclQF1aC/pw38yKNieBsjlriPdgicbui csLxZaxb4FpRieI/4UkXw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:M86nkUN7FAk=;Qq8oK3KC/enauIF9f4VIsv/yzLP JESw/bXTVt/7iyAsK2DmVi1P9PvPY7BzARScraqirSZ+jonf4RStF1CuRMZ/bZm8eM+f2q+Ai RBhPEZuT06ljJwYfdxK6Br1DYdnKNdRK9xWD/cT/LN5UU3T7JUyxPT6JdeLWGfS9PDYKBWW79 Sdj0uMdZyhiJ4mmB9O4ze06k4424WwmfXcVjDR9HOf4+sO5/rWT79rvDq3PQSVZRwY55vJO6R OMGdglHbgWuo5SJxUMs+S/6PYZA/mvcSN5oRlRCMDXhuc+8r58uJrSgQ6x8kHqUcwW+m6idEP JeRKSZ0gLw867/Voh+conNSpkY5F43d8UmzpIfyVsTAEVmabZ9t4YqALcOIpejT4uDoMMIT9c QTo5G9mF9jmn7LSeTpAcSXgVLNCaxH09thLn0RxEQyvd39opU4ty9t6lV3F5+IL7HoIlkWebQ oenIVyzgT2suQjldPEYSrvrREHCSxt1oqhlppwrMywbsBNx/LTxfjeWT6EYeDbcF6P4XK5irz Go2Mybsu3Pfol9aDM4O0WznAGRuVO0tLuBEYV/piRkFkz8vVe3cVrP+Tt3nWWVyes6LdJJCAS ApLadvIzb99Wom5z6n5xFm/vmKcia1/GxBCsVGqEDCyQJRbyNzSQUCJiuLmCqXXt2RL5KKdRE m/EFOxEAhmGCJNxo2lqPQ/Y776DHDwdipb+DVqomDoSoTA1BFqmTWqFu6nrBlyLEkzRC6XYMe rxfcP9Jq0f4r6ctCuZohJRmqb67g5nlcRzPl2xQAP9RT74j+E/wFSrVPqkBuPV+aP6nqWiXeH NpKzyydSWcdUz9eXoaKBMShQ== Received-SPF: pass client-ip=212.227.15.19; envelope-from=stephen.berman@gmx.net; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain 0. emacs -Q 1. C-u M-x sql-product-interactive RET Now the minbuffer displays the following: SQL product: ansi so it you want to change the product, e.g. to postgres, you first have to delete "ansi". Likewise, `M-x sql-set-product RET' produces the same minbuffer display, requiring deletion to change the product. The reason "ansi" is displayed after the prompt is that the definition of sql-read-product uses the same non-nil value of the deprecated argument INITIAL-INPUT as is used for the argument DEF. The attached patch makes INITIAL-INPUT nil, thus using only DEF, and also wraps the prompt argument of sql-read-product in format-prompt, so the default value is shown as part of the prompt and changing it does not require deletion. The patch also adjusts the two callers of sql-read-product accordingly. In GNU Emacs 31.0.50 (build 3, x86_64-pc-linux-gnu, GTK+ Version 3.24.43, cairo version 1.18.2) of 2024-09-12 built on strobelfssd Repository revision: 31e8500b061b6963708e66468fc89db1006226d7 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101013 System Description: Linux From Scratch r12.2-5-systemd Configured using: 'configure -C 'CFLAGS=-Og -g3'' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG LCMS2 LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB --=-=-= Content-Type: text/x-patch Content-Disposition: attachment Content-Description: sql-read-product patch Content-Transfer-Encoding: quoted-printable diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 5273ba2bee1..a0b350ce54f 100644 =2D-- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -2666,11 +2666,11 @@ sql-read-product "Read a valid SQL product." (let ((init (or (and initial (symbol-name initial)) "ansi"))) (intern (completing-read - prompt + (format-prompt prompt init) (mapcar (lambda (info) (symbol-name (car info))) sql-product-alist) nil 'require-match - init 'sql-product-history init)))) + nil 'sql-product-history init)))) (defun sql-add-product (product display &rest plist) "Add support for a database product in `sql-mode'. @@ -2912,7 +2912,7 @@ sql-highlight-product (defun sql-set-product (product) "Set `sql-product' to PRODUCT and enable appropriate highlighting." (interactive - (list (sql-read-product "SQL product: "))) + (list (sql-read-product "SQL product"))) (if (stringp product) (setq product (intern product))) (when (not (assoc product sql-product-alist)) (user-error "SQL product %s is not supported; treated as ANSI" produc= t) @@ -4546,7 +4546,7 @@ sql-product-interactive (setq product (cond ((=3D (prefix-numeric-value product) 4) ; C-u, prompt for produc= t - (sql-read-product "SQL product: " sql-product)) + (sql-read-product "SQL product" sql-product)) ((assoc product sql-product-alist) ; Product specified product) (t sql-product))) ; Default to sql-product --=-=-=-- ------------=_1726950662-24157-1-- From unknown Sat Jun 21 12:12:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73412: 31.0.50; Improve sql-read-product Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Sep 2024 23:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73412 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stephen Berman , Eli Zaretskii Cc: 73412-done@debbugs.gnu.org Received: via spool by 73412-done@debbugs.gnu.org id=D73412.1726962807458 (code D ref 73412); Sat, 21 Sep 2024 23:54:02 +0000 Received: (at 73412-done) by debbugs.gnu.org; 21 Sep 2024 23:53:27 +0000 Received: from localhost ([127.0.0.1]:40497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss9uo-00007K-PY for submit@debbugs.gnu.org; Sat, 21 Sep 2024 19:53:27 -0400 Received: from mail-ed1-f49.google.com ([209.85.208.49]:45341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss9un-000077-HL for 73412-done@debbugs.gnu.org; Sat, 21 Sep 2024 19:53:26 -0400 Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5c26311c6f0so4344677a12.3 for <73412-done@debbugs.gnu.org>; Sat, 21 Sep 2024 16:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726962719; x=1727567519; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=zolIzMcnxCnxmqm08OyjEd5PtP6s1lgISxrP+SjnTSQ=; b=P7QcaFATnyUmOp1Ok5yl+tyEoBV8EZ13S7ZdKvv6E4jDOGTR3nLneLwwHlMSsAC4fO u7zPayVjvvvXYtxlC/DtuOd0V8rmTqheV75uGPeUAUaDMHIDMe4xlog2V/XIxyhkgsOt foVnEmgNDKRJbCoE8uxP7Pc1idpeEXQ2vq0uhFDAu4e/yfxp4L7FAX1AlXJtKHyIGz3F tqxXsoTSNjyRoCLWgwHE3vVM9hioZ2HbUu9TwESvv98QVf+JeIOkWSf6F4/RbFpU7GHm JJtvooHZV9hCeoxPPj6bzAvGrTr3CtuDA+P3hT1xO5JOi6TERyOgpRo56Mqukhyfezbm GE/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726962719; x=1727567519; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zolIzMcnxCnxmqm08OyjEd5PtP6s1lgISxrP+SjnTSQ=; b=FBIaw+nszgpYS6sCStAJRc/D7nAyLn1xGOY5q/S+1oIjzHWPZPWZfv5n/5khaRY+8e I+/ZiOQ2cjkAmYOAJXd0DBgUZjYEoQ9XGrN/IVRT+n3dbIFD6mEmOpq2JjR7CcN+PzcR uMY2nw6lX+Skf8pmR5yKW4eIWJHaInJ98dqLdHN8Y2UgXWKku8G5A+0yV4nUUcWroZHt GAOmm3Tsm9MDmRkEv53d0sfPAFISWN3GiiuvZvrc7oa4CFTwt+yu6yTju1RBQIbxfb5E N6raXrPLGtxsCqGSsholSNyYUz2b3ZXWHNFvVAcODbLwdpJZCoIgjLhU+/y33yeYqteH 3dpw== X-Gm-Message-State: AOJu0YxyXJ1F8YxDKRT+iyLQM0g2jHbXO2qkJvumkBbZJdEh2A9fRuPw HMrYrvKQGpX+ozmJjRPypsqkIAJ9WB3P0B3+unO7lUBpZOx61N4kzDpYyhylzM7zvZJIBhxSS/X yoVmqP2nYyzxwlY5QRODdnDrtNI4= X-Google-Smtp-Source: AGHT+IE6xuL/cMfqY0Agd/erc1ODT18Lp1ek5Bpl6w0hPFxANOOGKFVhq0Fvfl8bsWZXbZcbvxz9RLflglKUk8vq/xM= X-Received: by 2002:a17:907:e2d5:b0:a8d:55ce:fb97 with SMTP id a640c23a62f3a-a90d4fe1c2emr647226766b.11.1726962718662; Sat, 21 Sep 2024 16:51:58 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 21 Sep 2024 16:51:57 -0700 From: Stefan Kangas In-Reply-To: <87zfo0n41p.fsf@gmx.net> References: <874j69nklr.fsf@gmx.net> <86o74h2fts.fsf@gnu.org> <87zfo0n41p.fsf@gmx.net> MIME-Version: 1.0 Date: Sat, 21 Sep 2024 16:51:57 -0700 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of text editors" writes: > Since this is a minor UI update and improvement with no change in > functionality I assume it does not need to be called out in NEWS, > right? I don't think that's needed. From unknown Sat Jun 21 12:12:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73412: 31.0.50; Improve sql-read-product Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 Sep 2024 04:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73412 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stephen Berman Cc: 73412@debbugs.gnu.org Received: via spool by 73412-submit@debbugs.gnu.org id=B73412.172698048328553 (code B ref 73412); Sun, 22 Sep 2024 04:49:01 +0000 Received: (at 73412) by debbugs.gnu.org; 22 Sep 2024 04:48:03 +0000 Received: from localhost ([127.0.0.1]:40633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssEVv-0007QT-6K for submit@debbugs.gnu.org; Sun, 22 Sep 2024 00:48:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssEVs-0007Py-J3 for 73412@debbugs.gnu.org; Sun, 22 Sep 2024 00:48:01 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ssETK-0000FW-Nq; Sun, 22 Sep 2024 00:45:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=rI90+UUXgru2QA3rOEa826kjFMUPFlxYlV/fsxPqiVk=; b=B5yyqHs7D3DS Iak7oeeweYxzBT3ZlINdrJAULNSG9Hjc9y/8H+6fpeCXpj1JmOycysXUTZDfeArPls8H2W0N+bJKb 7mlKckHiLNPUvO0ubbbEX8cyibVEHbvlcZFjAumzOkgCzxB3DNGyNNVPYRsa7Y7GZqa2ddXvObYMb InZZ5tMolGwEeOUPKKuVgNeNb54q7VMX/YE2/O4qs6DDWdjIDZ/C4O6jiucww7hv/VmYSWAurqIdT Llnva+f9sLNHZN3idKguK/MHg0tpwhM5jHmLnqh9CE6yZttxpjTBHnNDPX1zfI3vq0H8GbXD5tFVH sQrl7nRnfmJhes7svahspA==; Date: Sun, 22 Sep 2024 07:45:19 +0300 Message-Id: <86ikuo2t5s.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <87zfo0n41p.fsf@gmx.net> (message from Stephen Berman on Sat, 21 Sep 2024 22:29:54 +0200) References: <874j69nklr.fsf@gmx.net> <86o74h2fts.fsf@gnu.org> <87zfo0n41p.fsf@gmx.net> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Stephen Berman > Cc: 73412-done@debbugs.gnu.org > Date: Sat, 21 Sep 2024 22:29:54 +0200 > > On Sat, 21 Sep 2024 18:21:03 +0300 Eli Zaretskii wrote: > > >> Likewise, `M-x sql-set-product RET' produces the same minbuffer display, > >> requiring deletion to change the product. > >> > >> The reason "ansi" is displayed after the prompt is that the definition > >> of sql-read-product uses the same non-nil value of the deprecated > >> argument INITIAL-INPUT as is used for the argument DEF. The attached > >> patch makes INITIAL-INPUT nil, thus using only DEF, and also wraps the > >> prompt argument of sql-read-product in format-prompt, so the default > >> value is shown as part of the prompt and changing it does not require > >> deletion. The patch also adjusts the two callers of sql-read-product > >> accordingly. > > > > Thanks. > > > > I think this should go to the emacs-30 branch, no? > > I agree and did so in commit c1f2501f55d and am closing the bug. Since > this is a minor UI update and improvement with no change in > functionality I assume it does not need to be called out in NEWS, right? No, I don't think this warrants a NEWS item, no.