diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-22 14:31:33 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-23 08:48:53 -0700 |
| commit | 02f4802623db6ab74e0809841007fa1e41207b44 (patch) | |
| tree | 13378c9263055f7a391d1327981f7fad10db6ea3 /lisp | |
| parent | 3ddff080341580eb6fc18d907181e9cc2301f62d (diff) | |
| download | emacs-02f4802623db6ab74e0809841007fa1e41207b44.tar.gz | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/sql.el | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 9bb2cf4bdf9..f907a01d8cf 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 -;; help-gnu-emacs@gnu.org. 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 +;; bug-gnu-emacs@gnu.org. +;; 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 () |