diff options
| author | Stefan Monnier | 2010-06-18 10:13:59 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-06-18 10:13:59 -0400 |
| commit | 894e369ddf48e191638b8e66ce732f24ff9abe2a (patch) | |
| tree | 0d14b38c2946f0067c856911bf4949b7e8091a88 /lisp/progmodes | |
| parent | 4a330052b4815cf833071aae5cb312f6f0f63613 (diff) | |
| parent | b1a03ef6bfba4296dddc3df1e8f9d54aba3e45e3 (diff) | |
| download | emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.tar.gz emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.zip | |
Merge from trunk
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/sql.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index e4df102f542..19e60da7ea2 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -3119,7 +3119,7 @@ The default comes from `process-coding-system-alist' and | |||
| 3119 | (setq params (append (list sql-database) params))) | 3119 | (setq params (append (list sql-database) params))) |
| 3120 | (if (not (string= "" sql-server)) | 3120 | (if (not (string= "" sql-server)) |
| 3121 | (setq params (append (list (concat "--host=" sql-server)) params))) | 3121 | (setq params (append (list (concat "--host=" sql-server)) params))) |
| 3122 | (if (not (and sql-port (numberp sql-port))) | 3122 | (if (and sql-port (numberp sql-port)) |
| 3123 | (setq params (append (list (concat "--port=" (number-to-string sql-port))) params))) | 3123 | (setq params (append (list (concat "--port=" (number-to-string sql-port))) params))) |
| 3124 | (if (not (string= "" sql-password)) | 3124 | (if (not (string= "" sql-password)) |
| 3125 | (setq params (append (list (concat "--password=" sql-password)) params))) | 3125 | (setq params (append (list (concat "--password=" sql-password)) params))) |