diff options
| author | Sam Steingold | 2014-09-08 08:38:53 -0400 |
|---|---|---|
| committer | Sam Steingold | 2014-09-08 08:38:53 -0400 |
| commit | 04413dc3ba7a8a899a5bdab58798a5b44ac25f27 (patch) | |
| tree | bcb8466db8272067c1528bbea1cb5a2630e3f392 | |
| parent | 38bf570325d786cbdc50d4fbf789809132c60e3d (diff) | |
| download | emacs-04413dc3ba7a8a899a5bdab58798a5b44ac25f27.tar.gz emacs-04413dc3ba7a8a899a5bdab58798a5b44ac25f27.zip | |
(sql-default-directory): New user option.
* lisp/progmodes/sql.el (sql-default-directory): New user option.
(sql-product-interactive): Bind `default-directory' to it to
enable remote connections using Tramp.
| -rw-r--r-- | etc/NEWS | 11 | ||||
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/sql.el | 11 |
3 files changed, 23 insertions, 2 deletions
| @@ -146,6 +146,15 @@ protocols as well as for "telnet" and "ftp" are passed to Tramp. | |||
| 146 | 146 | ||
| 147 | *** New connection method "nc", which allows to access dumb busyboxes. | 147 | *** New connection method "nc", which allows to access dumb busyboxes. |
| 148 | 148 | ||
| 149 | ** SQL mode | ||
| 150 | |||
| 151 | *** New user variable `sql-default-directory' enables remote | ||
| 152 | connections using Tramp. | ||
| 153 | |||
| 154 | *** New command `sql-send-line-and-next' sends the current line to the | ||
| 155 | interactive buffer and advances to the next line, skipping whitespace | ||
| 156 | and comments. | ||
| 157 | |||
| 149 | ** VC and related modes | 158 | ** VC and related modes |
| 150 | 159 | ||
| 151 | *** New option `vc-annotate-background-mode' controls whether | 160 | *** New option `vc-annotate-background-mode' controls whether |
| @@ -209,7 +218,7 @@ position list returned for such events is now nil. | |||
| 209 | * Lisp Changes in Emacs 24.5 | 218 | * Lisp Changes in Emacs 24.5 |
| 210 | 219 | ||
| 211 | *** call-process-shell-command and process-file-shell-command | 220 | *** call-process-shell-command and process-file-shell-command |
| 212 | don't take "&rest args" an more. | 221 | don't take "&rest args" any more. |
| 213 | 222 | ||
| 214 | ** New function `funcall-interactively', which works like `funcall' | 223 | ** New function `funcall-interactively', which works like `funcall' |
| 215 | but makes `called-interactively-p' treat the function as (you guessed it) | 224 | but makes `called-interactively-p' treat the function as (you guessed it) |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 28f0ef0c520..d12138f3ead 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -4,6 +4,9 @@ | |||
| 4 | bound to C-c C-n. | 4 | bound to C-c C-n. |
| 5 | (sql-show-sqli-buffer): Display the buffer instead of its name and | 5 | (sql-show-sqli-buffer): Display the buffer instead of its name and |
| 6 | bind the command to C-c C-z. | 6 | bind the command to C-c C-z. |
| 7 | (sql-default-directory): New user option. | ||
| 8 | (sql-product-interactive): Bind `default-directory' to it to | ||
| 9 | enable remote connections using Tramp. | ||
| 7 | 10 | ||
| 8 | 2014-09-08 Glenn Morris <rgm@gnu.org> | 11 | 2014-09-08 Glenn Morris <rgm@gnu.org> |
| 9 | 12 | ||
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index c63339d98c8..486e6b651d2 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -282,6 +282,13 @@ file. Since that is a plaintext file, this could be dangerous." | |||
| 282 | :group 'SQL | 282 | :group 'SQL |
| 283 | :safe 'numberp) | 283 | :safe 'numberp) |
| 284 | 284 | ||
| 285 | (defcustom sql-default-directory nil | ||
| 286 | "Default directory for SQL processes." | ||
| 287 | :version "24.5" | ||
| 288 | :type 'string | ||
| 289 | :group 'SQL | ||
| 290 | :safe 'stringp) | ||
| 291 | |||
| 285 | ;; Login parameter type | 292 | ;; Login parameter type |
| 286 | 293 | ||
| 287 | (define-widget 'sql-login-params 'lazy | 294 | (define-widget 'sql-login-params 'lazy |
| @@ -4173,7 +4180,9 @@ the call to \\[sql-product-interactive] with | |||
| 4173 | (sql-password (default-value 'sql-password)) | 4180 | (sql-password (default-value 'sql-password)) |
| 4174 | (sql-server (default-value 'sql-server)) | 4181 | (sql-server (default-value 'sql-server)) |
| 4175 | (sql-database (default-value 'sql-database)) | 4182 | (sql-database (default-value 'sql-database)) |
| 4176 | (sql-port (default-value 'sql-port))) | 4183 | (sql-port (default-value 'sql-port)) |
| 4184 | (default-directory (or sql-default-directory | ||
| 4185 | default-directory))) | ||
| 4177 | (funcall (sql-get-product-feature product :sqli-comint-func) | 4186 | (funcall (sql-get-product-feature product :sqli-comint-func) |
| 4178 | product | 4187 | product |
| 4179 | (sql-get-product-feature product :sqli-options))) | 4188 | (sql-get-product-feature product :sqli-options))) |