From 6b183f85e02ae1b8527c1bbfa8c5e2c914d28f7c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 8 Feb 2018 21:40:46 -0500 Subject: * lisp/emacs-lisp/cl-macs.el (cl--sm-macroexpand): Handle lambda! (cl--old-macroexpand): Remove. (cl--sm-macroexpand): Change its calling convention, so it can use advice-add. Extend re-binding treatment of vars so it applies to all var-introducing forms rather than only to 'let'. (cl-symbol-macrolet): Use advice-add rather than fset. --- test/lisp/emacs-lisp/cl-lib-tests.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/lisp/emacs-lisp') diff --git a/test/lisp/emacs-lisp/cl-lib-tests.el b/test/lisp/emacs-lisp/cl-lib-tests.el index 69d0a747105..f100e8c6c5f 100644 --- a/test/lisp/emacs-lisp/cl-lib-tests.el +++ b/test/lisp/emacs-lisp/cl-lib-tests.el @@ -518,13 +518,14 @@ (ert-deftest cl-lib-symbol-macrolet-hide () - ;; bug#26325 + ;; bug#26325, bug#26073 (should (equal (let ((y 5)) (cl-symbol-macrolet ((x y)) (list x (let ((x 6)) (list x y)) - (cl-letf ((x 6)) (list x y))))) - '(5 (6 5) (6 6))))) + (cl-letf ((x 6)) (list x y)) + (apply (lambda (x) (+ x 1)) (list 8))))) + '(5 (6 5) (6 6) 9)))) (defun cl-lib-tests--dummy-function () ;; Dummy function to see if the file is compiled. -- cgit v1.2.3