[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 7c993c3: sql.el defcustom fixes
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 7c993c3: sql.el defcustom fixes |
Date: |
Thu, 22 Mar 2018 14:31:40 -0400 (EDT) |
branch: emacs-26
commit 7c993c34b048dbdcb2e79d8989935cce05c34ce2
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
sql.el defcustom fixes
* lisp/progmodes/sql.el (sql-login-params): Update.
Avoids type mismatch with postgres and sqlite login params.
(sql-postgres-login-params): Bump version.
---
lisp/progmodes/sql.el | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index d20c579..e4db6cc 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -26,10 +26,10 @@
;;; Commentary:
;; Please send bug reports and bug fixes to the mailing list at
-;; address@hidden If you want to subscribe to the mailing
-;; list, see the web page at
-;; https://lists.gnu.org/mailman/listinfo/help-gnu-emacs for
-;; instructions. I monitor this list actively. If you send an e-mail
+;; address@hidden
+;; See also the general help list at
+;; https://lists.gnu.org/mailman/listinfo/help-gnu-emacs
+;; I monitor this list actively. If you send an e-mail
;; to Alex Schroeder it usually makes it to me when Alex has a chance
;; to forward them along (Thanks, Alex).
@@ -292,6 +292,9 @@ file. Since that is a plaintext file, this could be
dangerous."
;; Login parameter type
+;; This seems too prescriptive. It probably fails to match some of
+;; the possible combinations. It would probably be better to just use
+;; plist for most of it.
(define-widget 'sql-login-params 'lazy
"Widget definition of the login parameters list"
:tag "Login Parameters"
@@ -331,13 +334,17 @@ file. Since that is a plaintext file, this could be
dangerous."
(list :tag "file"
(const :format "" database)
(const :format "" :file)
- regexp)
+ (choice (const nil) regexp)
+ (const :format "" :must-match)
+ (symbol :tag ":must-match"))
(list :tag "completion"
(const :format "" database)
+ (const :format "" :default)
+ (string :tag ":default")
(const :format "" :completion)
+ (sexp :tag ":completion")
(const :format "" :must-match)
- (restricted-sexp
- :match-alternatives (listp stringp))))
+ (symbol :tag ":must-match")))
(const port)))
;; SQL Product support
@@ -1088,7 +1095,7 @@ add your name with a \"-U\" prefix (such as \"-Umark\")
to the list."
server)
"List of login parameters needed to connect to Postgres."
:type 'sql-login-params
- :version "24.1"
+ :version "26.1"
:group 'SQL)
(defun sql-postgres-list-databases ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 7c993c3: sql.el defcustom fixes,
Glenn Morris <=