diff options
| author | Stefan Monnier | 2016-07-01 11:59:37 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2016-07-01 11:59:37 -0400 |
| commit | af0d0b8cfc38117ef7405bc1dd9f20e8705e8072 (patch) | |
| tree | 33d47a227ac5098343e70d65e9249d5b2a1a21e4 | |
| parent | d942c39c44dac1d73f9413979f754fa551f96cbb (diff) | |
| download | emacs-af0d0b8cfc38117ef7405bc1dd9f20e8705e8072.tar.gz emacs-af0d0b8cfc38117ef7405bc1dd9f20e8705e8072.zip | |
* lisp/auth-source.el (auth-source--symbol-keyword): Fix namespace
i.e. rename from auto-source--symbol-keyword.
| -rw-r--r-- | lisp/auth-source.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/auth-source.el b/lisp/auth-source.el index fe28a02c200..97059fa5bd9 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el | |||
| @@ -1155,7 +1155,7 @@ FILE is the file from which we obtained this token." | |||
| 1155 | (point-min) | 1155 | (point-min) |
| 1156 | (point-max)))))) | 1156 | (point-max)))))) |
| 1157 | 1157 | ||
| 1158 | (defun auto-source--symbol-keyword (symbol) | 1158 | (defun auth-source--symbol-keyword (symbol) |
| 1159 | (intern (format ":%s" symbol))) | 1159 | (intern (format ":%s" symbol))) |
| 1160 | 1160 | ||
| 1161 | (defun auth-source-netrc-normalize (alist filename) | 1161 | (defun auth-source-netrc-normalize (alist filename) |
| @@ -1191,7 +1191,7 @@ FILE is the file from which we obtained this token." | |||
| 1191 | (setq lexv (funcall token-decoder lexv))) | 1191 | (setq lexv (funcall token-decoder lexv))) |
| 1192 | lexv)))) | 1192 | lexv)))) |
| 1193 | (setq ret (plist-put ret | 1193 | (setq ret (plist-put ret |
| 1194 | (auto-source--symbol-keyword k) | 1194 | (auth-source--symbol-keyword k) |
| 1195 | v)))) | 1195 | v)))) |
| 1196 | ret)) | 1196 | ret)) |
| 1197 | alist)) | 1197 | alist)) |
| @@ -1268,7 +1268,7 @@ See `auth-source-search' for details on SPEC." | |||
| 1268 | ;; fill in the valist with whatever data we may have from the search | 1268 | ;; fill in the valist with whatever data we may have from the search |
| 1269 | ;; we complete the first value if it's a list and use the value otherwise | 1269 | ;; we complete the first value if it's a list and use the value otherwise |
| 1270 | (dolist (br base-required) | 1270 | (dolist (br base-required) |
| 1271 | (let ((val (plist-get spec (auto-source--symbol-keyword br)))) | 1271 | (let ((val (plist-get spec (auth-source--symbol-keyword br)))) |
| 1272 | (when val | 1272 | (when val |
| 1273 | (let ((br-choice (cond | 1273 | (let ((br-choice (cond |
| 1274 | ;; all-accepting choice (predicate is t) | 1274 | ;; all-accepting choice (predicate is t) |
| @@ -1280,7 +1280,7 @@ See `auth-source-search' for details on SPEC." | |||
| 1280 | 1280 | ||
| 1281 | ;; for extra required elements, see if the spec includes a value for them | 1281 | ;; for extra required elements, see if the spec includes a value for them |
| 1282 | (dolist (er create-extra) | 1282 | (dolist (er create-extra) |
| 1283 | (let ((k (auto-source--symbol-keyword er)) | 1283 | (let ((k (auth-source--symbol-keyword er)) |
| 1284 | (keys (loop for i below (length spec) by 2 | 1284 | (keys (loop for i below (length spec) by 2 |
| 1285 | collect (nth i spec)))) | 1285 | collect (nth i spec)))) |
| 1286 | (when (memq k keys) | 1286 | (when (memq k keys) |
| @@ -1292,7 +1292,7 @@ See `auth-source-search' for details on SPEC." | |||
| 1292 | ;; take the first element if the data is a list | 1292 | ;; take the first element if the data is a list |
| 1293 | (data (or (auth-source-netrc-element-or-first data) | 1293 | (data (or (auth-source-netrc-element-or-first data) |
| 1294 | (plist-get current-data | 1294 | (plist-get current-data |
| 1295 | (auto-source--symbol-keyword r)))) | 1295 | (auth-source--symbol-keyword r)))) |
| 1296 | ;; this is the default to be offered | 1296 | ;; this is the default to be offered |
| 1297 | (given-default (auth-source--aget | 1297 | (given-default (auth-source--aget |
| 1298 | auth-source-creation-defaults r)) | 1298 | auth-source-creation-defaults r)) |
| @@ -1382,7 +1382,7 @@ See `auth-source-search' for details on SPEC." | |||
| 1382 | 1382 | ||
| 1383 | (when data | 1383 | (when data |
| 1384 | (setq artificial (plist-put artificial | 1384 | (setq artificial (plist-put artificial |
| 1385 | (auto-source--symbol-keyword r) | 1385 | (auth-source--symbol-keyword r) |
| 1386 | (if (eq r 'secret) | 1386 | (if (eq r 'secret) |
| 1387 | (lexical-let ((data data)) | 1387 | (lexical-let ((data data)) |
| 1388 | (lambda () data)) | 1388 | (lambda () data)) |
| @@ -1840,7 +1840,7 @@ entries for git.gnus.org: | |||
| 1840 | 1840 | ||
| 1841 | (defun auth-source-macos-keychain-result-append (result generic k v) | 1841 | (defun auth-source-macos-keychain-result-append (result generic k v) |
| 1842 | (push v result) | 1842 | (push v result) |
| 1843 | (push (auto-source--symbol-keyword | 1843 | (push (auth-source--symbol-keyword |
| 1844 | (cond | 1844 | (cond |
| 1845 | ((equal k "acct") "user") | 1845 | ((equal k "acct") "user") |
| 1846 | ;; for generic keychains, creator is host, service is port | 1846 | ;; for generic keychains, creator is host, service is port |
| @@ -1957,7 +1957,7 @@ entries for git.gnus.org: | |||
| 1957 | ;; fill in the valist with whatever data we may have from the search | 1957 | ;; fill in the valist with whatever data we may have from the search |
| 1958 | ;; we complete the first value if it's a list and use the value otherwise | 1958 | ;; we complete the first value if it's a list and use the value otherwise |
| 1959 | (dolist (br base-required) | 1959 | (dolist (br base-required) |
| 1960 | (let ((val (plist-get spec (auto-source--symbol-keyword br)))) | 1960 | (let ((val (plist-get spec (auth-source--symbol-keyword br)))) |
| 1961 | (when val | 1961 | (when val |
| 1962 | (let ((br-choice (cond | 1962 | (let ((br-choice (cond |
| 1963 | ;; all-accepting choice (predicate is t) | 1963 | ;; all-accepting choice (predicate is t) |
| @@ -1969,7 +1969,7 @@ entries for git.gnus.org: | |||
| 1969 | 1969 | ||
| 1970 | ;; for extra required elements, see if the spec includes a value for them | 1970 | ;; for extra required elements, see if the spec includes a value for them |
| 1971 | (dolist (er create-extra) | 1971 | (dolist (er create-extra) |
| 1972 | (let ((k (auto-source--symbol-keyword er)) | 1972 | (let ((k (auth-source--symbol-keyword er)) |
| 1973 | (keys (loop for i below (length spec) by 2 | 1973 | (keys (loop for i below (length spec) by 2 |
| 1974 | collect (nth i spec)))) | 1974 | collect (nth i spec)))) |
| 1975 | (when (memq k keys) | 1975 | (when (memq k keys) |
| @@ -1981,7 +1981,7 @@ entries for git.gnus.org: | |||
| 1981 | ;; take the first element if the data is a list | 1981 | ;; take the first element if the data is a list |
| 1982 | (data (or (auth-source-netrc-element-or-first data) | 1982 | (data (or (auth-source-netrc-element-or-first data) |
| 1983 | (plist-get current-data | 1983 | (plist-get current-data |
| 1984 | (auto-source--symbol-keyword r)))) | 1984 | (auth-source--symbol-keyword r)))) |
| 1985 | ;; this is the default to be offered | 1985 | ;; this is the default to be offered |
| 1986 | (given-default (auth-source--aget | 1986 | (given-default (auth-source--aget |
| 1987 | auth-source-creation-defaults r)) | 1987 | auth-source-creation-defaults r)) |
| @@ -2041,10 +2041,10 @@ entries for git.gnus.org: | |||
| 2041 | (if (member r base-secret) | 2041 | (if (member r base-secret) |
| 2042 | (setq secret-artificial | 2042 | (setq secret-artificial |
| 2043 | (plist-put secret-artificial | 2043 | (plist-put secret-artificial |
| 2044 | (auto-source--symbol-keyword r) | 2044 | (auth-source--symbol-keyword r) |
| 2045 | data)) | 2045 | data)) |
| 2046 | (setq artificial (plist-put artificial | 2046 | (setq artificial (plist-put artificial |
| 2047 | (auto-source--symbol-keyword r) | 2047 | (auth-source--symbol-keyword r) |
| 2048 | data)))))) | 2048 | data)))))) |
| 2049 | (plstore-put (oref backend data) | 2049 | (plstore-put (oref backend data) |
| 2050 | (sha1 (format "%s@%s:%s" | 2050 | (sha1 (format "%s@%s:%s" |