[Emacs-diffs] master b3ff982: Fix 'sql-connect' on first invocation

[Eli Zaretskii]

branch: master
commit b3ff982a99a2fc330677b13884f9723912668e06
Author: Nikolay Kudryavtsev <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix 'sql-connect' on first invocation
    
    * lisp/progmodes/sql.el (sql-connect): Reorder code which sets
    param-var.  (Bug#19452)
---
 lisp/progmodes/sql.el |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 4d0bed7..9608a7d 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -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))))