diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-11-18 11:02:27 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-11-18 11:02:27 +0100 |
| commit | 2e92f176a3ae68ed6fcf9f07c173c61a497f33fd (patch) | |
| tree | c8781bac30354b7da98e2070d118707e9976cb09 /lisp/emacs-lisp/cl-extra.el | |
| parent | ccb8bbd581adac2cc1c770c266b5fd52da5c9402 (diff) | |
| download | emacs-2e92f176a3ae68ed6fcf9f07c173c61a497f33fd.tar.gz emacs-2e92f176a3ae68ed6fcf9f07c173c61a497f33fd.tar.bz2 emacs-2e92f176a3ae68ed6fcf9f07c173c61a497f33fd.zip | |
Fix cl-prettyexpand in the non-FULL case
* 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.
Diffstat (limited to 'lisp/emacs-lisp/cl-extra.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-extra.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 91034de5396..7e9d8fe870b 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -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. |