diff options
| author | Glenn Morris | 2009-02-14 03:38:00 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-02-14 03:38:00 +0000 |
| commit | f5107fea3e890e8641dde9faa0958c8dba2dda1d (patch) | |
| tree | f725e6474a7fa3b4b79a1f04f943ae63770c2aa6 /lisp | |
| parent | f623f7372cebd367cb159266db7660b2026c7815 (diff) | |
| download | emacs-f5107fea3e890e8641dde9faa0958c8dba2dda1d.tar.gz emacs-f5107fea3e890e8641dde9faa0958c8dba2dda1d.zip | |
Ian Eure <ian at digg.com> (tiny change)
(sql-product-alist, sql-connect-sqlite): Remove host, user, password
options not applicable to SQlite. (Bug#1904)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/sql.el | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 2e5dea59605..da0794b1f2b 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -356,7 +356,7 @@ highlighted properly when you open them." | |||
| 356 | :sqli-prompt-length 0) | 356 | :sqli-prompt-length 0) |
| 357 | (sqlite | 357 | (sqlite |
| 358 | :font-lock sql-mode-sqlite-font-lock-keywords | 358 | :font-lock sql-mode-sqlite-font-lock-keywords |
| 359 | :sqli-login (user password server database) | 359 | :sqli-login (database) |
| 360 | :sqli-connect sql-connect-sqlite | 360 | :sqli-connect sql-connect-sqlite |
| 361 | :sqli-prompt-regexp "^sqlite> " | 361 | :sqli-prompt-regexp "^sqlite> " |
| 362 | :sqli-prompt-length 8) | 362 | :sqli-prompt-length 8) |
| @@ -2611,12 +2611,6 @@ parameters and command options." | |||
| 2611 | (let ((params)) | 2611 | (let ((params)) |
| 2612 | (if (not (string= "" sql-database)) | 2612 | (if (not (string= "" sql-database)) |
| 2613 | (setq params (append (list sql-database) params))) | 2613 | (setq params (append (list sql-database) params))) |
| 2614 | (if (not (string= "" sql-server)) | ||
| 2615 | (setq params (append (list (concat "--host=" sql-server)) params))) | ||
| 2616 | (if (not (string= "" sql-password)) | ||
| 2617 | (setq params (append (list (concat "--password=" sql-password)) params))) | ||
| 2618 | (if (not (string= "" sql-user)) | ||
| 2619 | (setq params (append (list (concat "--user=" sql-user)) params))) | ||
| 2620 | (if (not (null sql-sqlite-options)) | 2614 | (if (not (null sql-sqlite-options)) |
| 2621 | (setq params (append sql-sqlite-options params))) | 2615 | (setq params (append sql-sqlite-options params))) |
| 2622 | (set-buffer (apply 'make-comint "SQL" sql-sqlite-program | 2616 | (set-buffer (apply 'make-comint "SQL" sql-sqlite-program |