From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 20 May 2018 07:25:26 +0000 (+0300)
Subject: Fix buffer names in sql.el
X-Git-Tag: emacs-26.1~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=845fe03;p=emacs.git

Fix buffer names in sql.el

* lisp/progmodes/sql.el (sql-product-interactive): Fix the way the
buffer name is determined by prefix arg.  (Bug#31446)
---

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index e4db6cc38a2..d783f6542e6 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4263,9 +4263,17 @@ the call to \\[sql-product-interactive] with
                 (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))))
+                         (cond
+                          ((zerop new-name)
+                           "*SQL*")
+                          ((stringp new-name)
+                           (if (string-prefix-p "*SQL: " new-name t)
+                               new-name
+                             (concat "*SQL: " new-name "*")))
+                          ((eq new-name '(4))
+                           (sql-rename-buffer new-name))
+                          (t
+                           (format "*SQL: %s*" new-name)))))
 
               ;; Set SQLi mode.
               (let ((sql-interactive-product product))