mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix 'sql-connect' on first invocation

Browse source 
* lisp/progmodes/sql.el (sql-connect): Reorder code which sets
param-var.  (Bug#19452)
This commit is contained in:
Nikolay Kudryavtsev 2016-12-02 11:53:33 +02:00 • committed by Eli Zaretskii
parent c662e2d4fc
commit b3ff982a99
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/progmodes/sql.el
View file

@ -4052,6 +4052,12 @@ is specified in the connection settings."
(if connect-set
;; Set the desired parameters
(let (param-var login-params set-params rem-params)
;; Set the parameters and start the interactive session
(mapc
(lambda (vv)
(set-default (car vv) (eval (cadr vv))))
(cdr connect-set))
(setq-default sql-connection connection)
;; :sqli-login params variable
(setq param-var
@ -4081,13 +4087,6 @@ is specified in the connection settings."
(unless (member token set-params)
(if plist (cons token plist) token)))))
;; Set the parameters and start the interactive session
(mapc
(lambda (vv)
(set-default (car vv) (eval (cadr vv))))
(cdr connect-set))
(setq-default sql-connection connection)
;; Start the SQLi session with revised list of login parameters
(eval `(let ((,param-var ',rem-params))
(sql-product-interactive ',sql-product ',new-name))))