diff options
| author | Glenn Morris | 2019-12-25 07:50:19 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-12-25 07:50:19 -0800 |
| commit | 2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09 (patch) | |
| tree | 3317f66921cf3cd0d787816217bfd056e2bc2a3f /lisp/progmodes/sql.el | |
| parent | 93d4725f9ceabfaf40e75ecf2e28b67789741941 (diff) | |
| parent | ca6a53d3bc91d6fef9aa872495ab74298ce91bee (diff) | |
| download | emacs-2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09.tar.gz emacs-2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09.zip | |
Merge from origin/emacs-27
ca6a53d3bc Don't default to showing X-Faces externally in Gnus
dbf4b5b2d0 Fix manual typo in Special Read Syntax
a9fe6dfa90 Fix problem with emacs -nw / eww / svg
0de63092c8 Clarify base64 requirements and say what {en,de}code_codin...
6184aa003f ; * etc/NEWS: Fix boring oddities.
51ea32dd12 * src/emacs-module.h.in: Add reference to manual.
75d0cef20d Trivial docstring fixes
ee12c421b6 imagemagick-types needs to initialize ImageMagick
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/progmodes/sql.el')
| -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 aa42873a3dd..7a51739c5f3 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -860,7 +860,7 @@ The specified function will be called as: | |||
| 860 | (wallet-func WALLET PRODUCT USER SERVER DATABASE PORT) | 860 | (wallet-func WALLET PRODUCT USER SERVER DATABASE PORT) |
| 861 | 861 | ||
| 862 | It is expected to return either a string containing the password, | 862 | It is expected to return either a string containing the password, |
| 863 | a function returning the password, or nil, If you want to support | 863 | a function returning the password, or nil. If you want to support |
| 864 | another format of password file, then implement a different | 864 | another format of password file, then implement a different |
| 865 | search wallet function and identify the location of the password | 865 | search wallet function and identify the location of the password |
| 866 | store with `sql-password-wallet'.") | 866 | store with `sql-password-wallet'.") |