[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master ca5fb2b922 1/3: Fix prompts in sql-get-login again
From: |
Lars Ingebrigtsen |
Subject: |
master ca5fb2b922 1/3: Fix prompts in sql-get-login again |
Date: |
Sat, 23 Apr 2022 08:52:59 -0400 (EDT) |
branch: master
commit ca5fb2b922581505ad96d7e03c2a7bba17adb8e8
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
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).
---
lisp/progmodes/sql.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 13fba0c705..18b0274fbf 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