diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/progmodes/sql.el | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/progmodes/sql.el')
-rw-r--r-- | lisp/progmodes/sql.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index abc99eec909..40596749de7 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -2987,7 +2987,7 @@ supported: :number t In order to ask the user for username, password and database, call the -function like this: (sql-get-login 'user 'password 'database)." +function like this: (sql-get-login \\='user \\='password \\='database)." (dolist (w what) (let ((plist (cdr-safe w))) (pcase (or (car-safe w) w) @@ -4891,7 +4891,7 @@ your might try undecided-dos as a coding system. If this doesn't help, Try to set `comint-output-filter-functions' like this: \(setq comint-output-filter-functions (append comint-output-filter-functions - '(comint-strip-ctrl-m))) + \\='(comint-strip-ctrl-m))) \(Type \\[describe-mode] in the SQL buffer for a list of commands.)" (interactive "P") |