From: Filipp Gunbin <fgunbin@fastmail.fm>
Date: Sat, 23 Apr 2022 12:29:45 +0000 (+0200)
Subject: Fix prompts in sql-get-login again
X-Git-Tag: emacs-29.0.90~1931^2~349
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca5fb2b922581505ad96d7e03c2a7bba17adb8e8;p=emacs.git

Fix prompts in sql-get-login again

* lisp/progmodes/sql.el (sql-get-login-ext): Use prompt-def
everywhere.
(sql-get-login): Revert previous fix (bug#52546).
---

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 13fba0c7058..18b0274fbfd 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -3216,7 +3216,7 @@ For both `:file' and `:completion', there can also be a
      (cond
       ((plist-member plist :file)
        (let ((file-name
-              (read-file-name prompt
+              (read-file-name prompt-def
                               (file-name-directory last-value)
                               default
                               (if (plist-member plist :must-match)
@@ -3246,7 +3246,7 @@ For both `:file' and `:completion', there can also be a
                         default))
 
       ((plist-get plist :number)
-       (read-number prompt (or default last-value 0)))
+       (read-number (concat prompt ": ") (or default last-value 0)))
 
       (t
        (read-string prompt-def last-value history-var default))))))
@@ -3318,7 +3318,7 @@ function like this: (sql-get-login \\='user \\='password \\='database)."
          (sql-get-login-ext 'sql-server "Server" 'sql-server-history plist))
 
         ('database
-         (sql-get-login-ext 'sql-database "Database: "
+         (sql-get-login-ext 'sql-database "Database"
                             'sql-database-history plist))
 
         ('port