diff options
| author | Paul Eggert | 2017-03-19 12:27:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-19 12:27:55 -0700 |
| commit | 59ced4521ebdadaf48b9c22b7cda46407a8b942b (patch) | |
| tree | e200fa9accae153426fb414cde550435d94cc58d /lisp/progmodes/sql.el | |
| parent | 8893d81fc30c2fd9afceecb4e0325edc9c8b3f50 (diff) | |
| parent | 5569e644448eb84dce1ca9359ae33901347acac8 (diff) | |
| download | emacs-59ced4521ebdadaf48b9c22b7cda46407a8b942b.tar.gz emacs-59ced4521ebdadaf48b9c22b7cda46407a8b942b.zip | |
Merge from origin/emacs-25
5569e64 ; Spelling fixes
24a5f57 * lisp/net/eww.el (eww-tag-meta): Handle single quoted URLs (...
9b89896 * lisp/progmodes/sql.el (sql-product-alist): Doc tweak
69b50f5 * lisp/progmodes/sql.el (sql-product-alist): Doc fix. (Bug#2...
42eae54 Improve documentation of dabbrevs
b0ade0d Clarify that easy-menu-add is a nop (Bug#25382)
3c69f2c * lisp/textmodes/rst.el (rst-package-emacs-version-alist): Fi...
# Conflicts:
# lisp/textmodes/rst.el
Diffstat (limited to 'lisp/progmodes/sql.el')
| -rw-r--r-- | lisp/progmodes/sql.el | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 634c6b57bdc..68ca37207ef 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -551,14 +551,17 @@ may be any one of the following: | |||
| 551 | database and server) needed to connect to | 551 | database and server) needed to connect to |
| 552 | the database. | 552 | the database. |
| 553 | 553 | ||
| 554 | :sqli-comint-func name of a function which accepts no | 554 | :sqli-comint-func function of two arguments, PRODUCT |
| 555 | parameters that will use the values of | 555 | and OPTIONS, that will open a comint buffer |
| 556 | `sql-user', `sql-password', | 556 | and connect to the database. PRODUCT is the |
| 557 | `sql-database', `sql-server' and | 557 | first argument to be passed to `sql-comint', |
| 558 | `sql-port' to open a comint buffer and | 558 | and OPTIONS should be included in its second |
| 559 | connect to the database. Do product | 559 | argument. The function should use the values |
| 560 | of `sql-user', `sql-password', `sql-database', | ||
| 561 | `sql-server' and `sql-port' to . Do product | ||
| 560 | specific configuration of comint in this | 562 | specific configuration of comint in this |
| 561 | function. | 563 | function. See `sql-comint-oracle' for an |
| 564 | example of such a function. | ||
| 562 | 565 | ||
| 563 | :list-all Command string or function which produces | 566 | :list-all Command string or function which produces |
| 564 | a listing of all objects in the database. | 567 | a listing of all objects in the database. |