branch: elpa/llama commit 788b2436241551c01235d61c1a2595d165af8ff6 Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
llama--arguments: Cosmetics --- llama.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/llama.el b/llama.el index 5b66561f6b..33dff5b2e3 100644 --- a/llama.el +++ b/llama.el @@ -141,18 +141,18 @@ It also looks a bit like #\\='function." (defun llama--collect (expr args) (cond ((symbolp expr) - (let ((name (symbol-name expr)) pos) + (let ((name (symbol-name expr))) (save-match-data (when (string-match "\\`[%&]\\([1-9*]\\)?\\'" name) - (setq pos (match-string 1 name)) - (setq pos (cond ((equal pos "*") 0) - ((not pos) 1) - ((string-to-number pos)))) - (when (and (= pos 1) - (aref args 1) - (not (equal expr (aref args 1)))) - (error "`%s' and `%s' are mutually exclusive" expr (aref args 1))) - (aset args pos expr))))) + (let* ((pos (match-string 1 name)) + (pos (cond ((equal pos "*") 0) + ((not pos) 1) + ((string-to-number pos))))) + (when (and (= pos 1) + (aref args 1) + (not (equal expr (aref args 1)))) + (error "`%s' and `%s' are mutually exclusive" expr (aref args 1))) + (aset args pos expr)))))) ((memq (car-safe expr) '(## quote))) ((listp expr) (while (consp (cdr expr))