diff options
| -rw-r--r-- | lisp/erc/erc-services.el | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index c2e653d9166..348a592a888 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el | |||
| @@ -313,25 +313,32 @@ The last two elements are optional." | |||
| 313 | 313 | ||
| 314 | 314 | ||
| 315 | (define-inline erc-nickserv-alist-sender (network &optional entry) | 315 | (define-inline erc-nickserv-alist-sender (network &optional entry) |
| 316 | (inline-quote (nth 1 (or ,entry (assoc ,network erc-nickserv-alist))))) | 316 | (inline-letevals (network entry) |
| 317 | (inline-quote (nth 1 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 317 | 318 | ||
| 318 | (define-inline erc-nickserv-alist-regexp (network &optional entry) | 319 | (define-inline erc-nickserv-alist-regexp (network &optional entry) |
| 319 | (inline-quote (nth 2 (or ,entry (assoc ,network erc-nickserv-alist))))) | 320 | (inline-letevals (network entry) |
| 321 | (inline-quote (nth 2 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 320 | 322 | ||
| 321 | (define-inline erc-nickserv-alist-nickserv (network &optional entry) | 323 | (define-inline erc-nickserv-alist-nickserv (network &optional entry) |
| 322 | (inline-quote (nth 3 (or ,entry (assoc ,network erc-nickserv-alist))))) | 324 | (inline-letevals (network entry) |
| 325 | (inline-quote (nth 3 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 323 | 326 | ||
| 324 | (define-inline erc-nickserv-alist-ident-keyword (network &optional entry) | 327 | (define-inline erc-nickserv-alist-ident-keyword (network &optional entry) |
| 325 | (inline-quote (nth 4 (or ,entry (assoc ,network erc-nickserv-alist))))) | 328 | (inline-letevals (network entry) |
| 329 | (inline-quote (nth 4 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 326 | 330 | ||
| 327 | (define-inline erc-nickserv-alist-use-nick-p (network &optional entry) | 331 | (define-inline erc-nickserv-alist-use-nick-p (network &optional entry) |
| 328 | (inline-quote (nth 5 (or ,entry (assoc ,network erc-nickserv-alist))))) | 332 | (inline-letevals (network entry) |
| 333 | (inline-quote (nth 5 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 329 | 334 | ||
| 330 | (define-inline erc-nickserv-alist-ident-command (network &optional entry) | 335 | (define-inline erc-nickserv-alist-ident-command (network &optional entry) |
| 331 | (inline-quote (nth 6 (or ,entry (assoc ,network erc-nickserv-alist))))) | 336 | (inline-letevals (network entry) |
| 337 | (inline-quote (nth 6 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 332 | 338 | ||
| 333 | (define-inline erc-nickserv-alist-identified-regexp (network &optional entry) | 339 | (define-inline erc-nickserv-alist-identified-regexp (network &optional entry) |
| 334 | (inline-quote (nth 7 (or ,entry (assoc ,network erc-nickserv-alist))))) | 340 | (inline-letevals (network entry) |
| 341 | (inline-quote (nth 7 (or ,entry (assoc ,network erc-nickserv-alist)))))) | ||
| 335 | 342 | ||
| 336 | ;; Functions: | 343 | ;; Functions: |
| 337 | 344 | ||