From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 21 May 2018 15:43:03 +0000 (+0300)
Subject: Another attempt to fix sql.el
X-Git-Tag: emacs-26.1~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2981952;p=emacs.git

Another attempt to fix sql.el

* lisp/progmodes/sql.el (sql-product-interactive): Fix calculation
of the SQL buffer name.  (Bug#31446)
---

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 1b2cdaf5f60..e7d7494d2ca 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4270,8 +4270,13 @@ the call to \\[sql-product-interactive] with
                            (if (string-prefix-p "*SQL: " new-name t)
                                new-name
                              (concat "*SQL: " new-name "*")))
-                          ((eq new-name '(4))
-                           (sql-rename-buffer new-name))
+                          ((equal new-name '(4))
+                           (concat
+                            "*SQL: "
+                            (read-string
+                             "Buffer name (\"*SQL: XXX*\"; enter `XXX'): "
+                             sql-alternate-buffer-name)
+                            "*"))
                           (t
                            (format "*SQL: %s*" new-name)))))