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

* 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'.

diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index c2e653d916665d24024236a01201398e79ee57c5..348a592a888bf79f606d125e68bd0448fe720aec 100644 (file)
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -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: