From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 18 Mar 2022 20:07:42 +0000 (-0400)
Subject: * lisp/emacs-lisp/bytecomp.el (byte-compile-make-closure): Minor optimization
X-Git-Tag: emacs-29.0.90~1931^2~1048
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab8a34ce8a54539cc9f66892145153312fa2a7fa;p=emacs.git

* lisp/emacs-lisp/bytecomp.el (byte-compile-make-closure): Minor optimization
---

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c680437f324..c39d931517e 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3924,7 +3924,7 @@ discarding."
 		     docstring-exp))	;Otherwise, we don't need a closure.
       (cl-assert (byte-code-function-p fun))
       (byte-compile-form
-       (if (or (not docstring-exp) (stringp docstring-exp))
+       (if (macroexp-const-p docstring-exp)
            ;; Use symbols V0, V1 ... as placeholders for closure variables:
            ;; they should be short (to save space in the .elc file), yet
            ;; distinct when disassembled.
@@ -3940,7 +3940,7 @@ discarding."
                           (vconcat dummy-vars (aref fun 2))
                           (aref fun 3)
                           (if docstring-exp
-                              (cons docstring-exp (cdr opt-args))
+                              (cons (eval docstring-exp t) (cdr opt-args))
                             opt-args))))
              `(make-closure ,proto-fun ,@env))
          ;; Nontrivial doc string expression: create a bytecode object