From 3d60a9ba31f1e25fb4b1eada467c88c91f4b79e2 Mon Sep 17 00:00:00 2001 From: Robin Templeton Date: Fri, 18 Jul 2014 15:07:44 -0400 Subject: [PATCH] flet/labels support in macroexp --- lisp/emacs-lisp/macroexp.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 44727daf76..31e18000c0 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -203,6 +203,12 @@ Assumes the caller has bound `macroexpand-all-environment'." (macroexp--all-forms body) (cdr form)) form)) + (`(,(and fun (or `flet `labels)) . ,(or `(,bindings . ,body) dontcare)) + (macroexp--cons fun + (macroexp--cons (macroexp--all-clauses bindings 2) + (macroexp--all-forms body) + (cdr form)) + form)) (`(,(and fun `(lambda . ,_)) . ,args) ;; Embedded lambda in function position. (macroexp--cons (macroexp--all-forms fun 2) -- 2.20.1