Remove the interstital unused function and clean up the macro def

1 files changed, 4 insertions, 12 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 9d04c9ef0e0..b00963c5c13 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -514,10 +514,10 @@ Return the compile-time value of FORM."
                                 expanded)))))
     (with-suppressed-warnings
         . ,(lambda (warnings &rest body)
-             (list #'internal--with-suppressed-warnings
-                   (list 'quote warnings)
-                   (macroexpand-all (cons 'progn body)
-                                    macroexpand-all-environment)))))
+             `(internal--with-suppressed-warnings
+               ',warnings
+               ,(macroexpand-all `(progn ,@body)
+                                 macroexpand-all-environment)))))
   "The default macro-environment passed to macroexpand by the compiler.
 Placing a macro here will cause a macro to have different semantics when
 expanded by the compiler as when expanded by the interpreter.")
@@ -2535,14 +2535,6 @@ list that represents a doc string reference.
     (mapc 'byte-compile-file-form (cdr form))
     nil))
 
-(defun internal--with-suppressed-warnings (_ &rest body)
-  "Placeholder function used to connect between macro and byte compilation.
-`byte-compile-initial-macro-environment' maps
-`with-suppressed-warnings' to
-`internal--with-suppressed-warnings', and the `byte-hunk-handler'
-for that function basically turns it into a `progn'."
-  (car (last body)))
-
 (put 'internal--with-suppressed-warnings 'byte-hunk-handler
      'byte-compile-file-form-with-suppressed-warnings)
 (defun byte-compile-file-form-with-suppressed-warnings (form)