Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

lisp/erc/erc-services.el: Fix arg eval order of inline functions.

Browse source 
* lisp/erc/erc-services.el (erc-nickserv-alist-sender,
  erc-nickserv-alist-regexp, erc-nickserv-alist-nickserv,
  erc-nickserv-alist-ident-keyword, erc-nickserv-alist-use-nick-p,
  erc-nickserv-alist-ident-command,
  erc-nickserv-alist-identified-regexp): Use `inline-letevals' to make
  sure that `network' is evaluated first and independently of `entry'.
This commit is contained in:
Vibhav Pant 2017-11-19 14:52:06 +05:30
parent d547f417c8
commit afbd8140e4
No known key found for this signature in database
GPG key ID: E3FB28CB6AB59598
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/erc/erc-services.el
View file

@ -313,25 +313,32 @@ The last two elements are optional."
(define-inline erc-nickserv-alist-sender (network &optional entry)
(inline-quote (nth 1 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 1 (or ,entry (assoc ,network erc-nickserv-alist))))))
(define-inline erc-nickserv-alist-regexp (network &optional entry)
(inline-quote (nth 2 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 2 (or ,entry (assoc ,network erc-nickserv-alist))))))
(define-inline erc-nickserv-alist-nickserv (network &optional entry)
(inline-quote (nth 3 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 3 (or ,entry (assoc ,network erc-nickserv-alist))))))
(define-inline erc-nickserv-alist-ident-keyword (network &optional entry)
(inline-quote (nth 4 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 4 (or ,entry (assoc ,network erc-nickserv-alist))))))
(define-inline erc-nickserv-alist-use-nick-p (network &optional entry)
(inline-quote (nth 5 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 5 (or ,entry (assoc ,network erc-nickserv-alist))))))
(define-inline erc-nickserv-alist-ident-command (network &optional entry)
(inline-quote (nth 6 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 6 (or ,entry (assoc ,network erc-nickserv-alist))))))
(define-inline erc-nickserv-alist-identified-regexp (network &optional entry)
(inline-quote (nth 7 (or ,entry (assoc ,network erc-nickserv-alist)))))
(inline-letevals (network entry)
(inline-quote (nth 7 (or ,entry (assoc ,network erc-nickserv-alist))))))
;; Functions: