aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2016-12-27 12:44:32 -0500
committerStefan Monnier2016-12-28 11:50:02 -0500
commitaf1b1026dd4fe5632a08f607aa5adc189ecadf2a (patch)
tree84880c43ffca15511e0498d9cbb1d402290e398d
parent697167b5432a89db009238cf5cbddc61e69ad339 (diff)
downloademacs-af1b1026dd4fe5632a08f607aa5adc189ecadf2a.tar.gz
emacs-af1b1026dd4fe5632a08f607aa5adc189ecadf2a.zip
* lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)
(inline--dont-quote): Quote the function with #' when passing it to `apply'. Cherry picked from commit e6161f648903d821865b9610b3b6aa0f82a5dcb7.
-rw-r--r--lisp/emacs-lisp/inline.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el
index 058c56c3b49..5ceb0d9ed29 100644
--- a/lisp/emacs-lisp/inline.el
+++ b/lisp/emacs-lisp/inline.el
@@ -191,9 +191,9 @@ After VARS is handled, BODY is evaluated in the new environment."
191 (while (and (consp exp) (not (eq '\, (car exp)))) 191 (while (and (consp exp) (not (eq '\, (car exp))))
192 (push (inline--dont-quote (pop exp)) args)) 192 (push (inline--dont-quote (pop exp)) args))
193 (setq args (nreverse args)) 193 (setq args (nreverse args))
194 (if exp 194 (if (null exp)
195 `(apply ,@args ,(inline--dont-quote exp)) 195 args
196 args))) 196 `(apply #',(car args) ,@(cdr args) ,(inline--dont-quote exp)))))
197 (_ exp))) 197 (_ exp)))
198 198
199(defun inline--do-leteval (var-exp &rest body) 199(defun inline--do-leteval (var-exp &rest body)