From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Filipp Gunbin Newsgroups: gmane.emacs.bugs Subject: bug#31446: 26.1; sql-interactive-mode buffer naming is broken Date: Tue, 22 May 2018 14:27:27 +0300 Message-ID: References: <83d0xti993.fsf@gnu.org> <83bmddi2ad.fsf@gnu.org> <83603lhrvw.fsf@gnu.org> <8336yoiuf4.fsf@gnu.org> <83d0xpf47n.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1526988366 22813 195.159.176.226 (22 May 2018 11:26:06 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 22 May 2018 11:26:06 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (darwin) Cc: psainty@orcon.net.nz, 31446@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 22 13:26:02 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 1fL5QX-0005mC-7Z for geb-bug-gnu-emacs@m.gmane.org; Tue, 22 May 2018 13:26:01 +0200 Original-Received: from localhost ([::1]:54911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fL5Se-0000N1-DI for geb-bug-gnu-emacs@m.gmane.org; Tue, 22 May 2018 07:28:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fL5SX-0000Mr-RY for bug-gnu-emacs@gnu.org; Tue, 22 May 2018 07:28:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fL5SU-00087W-Lc for bug-gnu-emacs@gnu.org; Tue, 22 May 2018 07:28:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35844) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fL5SU-00087P-HX for bug-gnu-emacs@gnu.org; Tue, 22 May 2018 07:28:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fL5SU-00063l-6V for bug-gnu-emacs@gnu.org; Tue, 22 May 2018 07:28:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Filipp Gunbin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 May 2018 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31446 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 31446-submit@debbugs.gnu.org id=B31446.152698845623262 (code B ref 31446); Tue, 22 May 2018 11:28:02 +0000 Original-Received: (at 31446) by debbugs.gnu.org; 22 May 2018 11:27:36 +0000 Original-Received: from localhost ([127.0.0.1]:43741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fL5S4-000638-6o for submit@debbugs.gnu.org; Tue, 22 May 2018 07:27:36 -0400 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:50819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fL5S1-00062z-R9 for 31446@debbugs.gnu.org; Tue, 22 May 2018 07:27:34 -0400 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id A359421127; Tue, 22 May 2018 07:27:33 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 22 May 2018 07:27:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.fm; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=dOqUp1lQG4X88hpI0qsAHfBh4qNKZyw4suz/FuJsu4E=; b=fpv/dsjQ nxH4NupRgRTaeX+nJUTSkf4jf9dstF9I95rI3XK9fTd/XTuvPlALR93lWnPTVTFy oqO/CDebBNYlEZp84LA/gvJ5pHP/7zAfKBLWnrI592hNdSGnIpx6sWb0tcR3zSiI YhRqgrBMMuYUHas0lYAmEpiBP9kGxuEGjs2yMk3PLCBohpZaFTxoAaZgsgxVwn85 2bFinvWzkoBCYSs5dDGZDaA1OkAt0qs6BHsmFStBdn2S6pQlE0iRnX+S/eIpYjqH /28Sr5M+RPYfXkmM1NhojWA+S96IOO+V5ezC1fLDirxw/0K571x4tLBzbd3hzhwj zzrtSO0iaH1f+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=dOqUp1lQG4X88hpI0qsAHfBh4qNKZ yw4suz/FuJsu4E=; b=DYV4utXGOix/y4wtMHxv0A0aT5ZhdvLbLZqIuw81hZyvZ DUKoXTGhqn+Bt7gva4iCG2kmzIeiUNljJKf18s5JQi1yUulOirJpGfk36k3g0oHn dqtshQ7fv0XaBC7Z4mN2nXRpB2tKlVNOeIIj9k6oSUJEBi+tyDnJN+2ToIOScHMg 3SZ8PxTGJgOWXLq9sd8apcnw5hHQu6lKlsMyG6Zs4kFj8RTbpHbXGZr+H46naVnn OCASJ4fej4KYxHOqAHQ+LIa+ZOwl9hh9cC5LkHs6IEU3wCK2CZsN/ei6IZKzhPnT FMw5MVFBXXNko5HWcaITqrtEiaRVJ8QAPiakL5bdA== X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Sender: Original-Received: from fgunbin.local (dhcp4.pdmi.ras.ru [83.149.197.228]) by mail.messagingengine.com (Postfix) with ESMTPA id 9D297E490E; Tue, 22 May 2018 07:27:32 -0400 (EDT) In-Reply-To: <83d0xpf47n.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 21 May 2018 17:55:40 +0300") 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:146379 Archived-At: On 21/05/2018 17:55 +0300, Eli Zaretskii wrote: >> From: Filipp Gunbin >> Cc: psainty@orcon.net.nz, 31446@debbugs.gnu.org >> Date: Mon, 21 May 2018 02:53:08 +0300 >> >> That looks reasonable, but, as I wrote earlier, why implement >> name-choosing logic here, if it's in `sql-comint' already. Even if some >> of such logic was here before the fix, it doesn't necessarily mean that >> was right. > > Maybe I'm missing something, but it looks like sql-comint and > sql-product-interactive belong to 2 different families of entry points > in the package. Some call sql-product-interactive, while the others > call sql-comint. Isn't that so? sql-product-interactive is one of the entry points (a generic one). Other entry points are sql-postgres and the like, which specify product. Well, this patch works for me. If I call `C-u C-u sql-product-interactive' multiple times, then first I get *SQL* buffer, then *SQL-postgres* buffer, then *SQL-postgres1* and so on. With just C-u I am switched to existing buffer. Filipp diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 64651aff11..856250c194 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -4196,10 +4196,8 @@ sql-product-interactive If buffer `*SQL*' exists but no process is running, make a new process. If buffer exists and a process is running, just switch to buffer `*SQL*'. -To specify the SQL product, prefix the call with -\\[universal-argument]. To set the buffer name as well, prefix -the call to \\[sql-product-interactive] with -\\[universal-argument] \\[universal-argument]. +When called interactively, \\[universal-argument] enables product selection. +\\[universal-argument] \\[universal-argument], in addition to that, forces new buffer to be created. \(Type \\[describe-mode] in the SQL buffer for a list of commands.)" (interactive "P") @@ -4254,9 +4252,7 @@ sql-product-interactive (funcall (sql-get-product-feature product :sqli-comint-func) product (sql-get-product-feature product :sqli-options) - (if (and new-name (string-prefix-p "SQL" new-name t)) - new-name - (concat "SQL: " new-name)))) + (if (consp new-name) nil new-name))) ;; Set SQLi mode. (let ((sql-interactive-product product))