mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-08 15:35:02 +00:00
Code Issues Releases Activity

Fix cl-prettyexpand in the non-FULL case

Browse Source 
* lisp/emacs-lisp/cl-extra.el (cl-prettyexpand): This function has
apparently not worked for at least a couple of decades
(bug#38206) unless supplied with a FULL parameter.  Make the FULL
parameter obsolete and make the function always work as it did
with a non-nil FULL.
This commit is contained in:
Lars Ingebrigtsen 2019-11-18 11:02:27 +01:00
parent ccb8bbd581
commit 2e92f176a3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/emacs-lisp/cl-extra.el
View File

@ -693,17 +693,15 @@ PROPLIST is a list of the sort returned by `symbol-plist'.
(forward-sexp)))
;;;###autoload
(defun cl-prettyexpand (form &optional full)
"Expand macros in FORM and insert the pretty-printed result.
Optional argument FULL non-nil means to expand all macros,
including `cl-block' and `cl-eval-when'."
(defun cl-prettyexpand (form &optional _full)
"Expand macros in FORM and insert the pretty-printed result."
(declare (advertised-calling-convention (form) "27.1"))
(message "Expanding...")
(let ((cl--compiling-file full)
(byte-compile-macro-environment nil))
(setq form (macroexpand-all form
(and (not full) '((cl-block) (cl-eval-when)))))
(let ((byte-compile-macro-environment nil))
(setq form (macroexpand-all form))
(message "Formatting...")
(prog1 (cl-prettyprint form)
(prog1
(cl-prettyprint form)
(message ""))))
;;; Integration into the online help system.