emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-25 af1b102: * lisp/emacs-lisp/inline.el: Fix apply-c


From: Stefan Monnier
Subject: [Emacs-diffs] emacs-25 af1b102: * lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)
Date: Wed, 28 Dec 2016 16:51:06 +0000 (UTC)

branch: emacs-25
commit af1b1026dd4fe5632a08f607aa5adc189ecadf2a
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * 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.
---
 lisp/emacs-lisp/inline.el |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el
index 058c56c..5ceb0d9 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."
        (while (and (consp exp) (not (eq '\, (car exp))))
          (push (inline--dont-quote (pop exp)) args))
        (setq args (nreverse args))
-       (if exp
-           `(apply ,@args ,(inline--dont-quote exp))
-         args)))
+       (if (null exp)
+           args
+         `(apply #',(car args) ,@(cdr args) ,(inline--dont-quote exp)))))
     (_ exp)))
 
 (defun inline--do-leteval (var-exp &rest body)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]