From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 2 Feb 2018 15:28:34 +0000 (-0500)
Subject: * lisp/emacs-lisp/cconv.el (cconv-convert): Fix compiling compiled code
X-Git-Tag: emacs-27.0.90~5751
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ff8b7749fcc96b79489f73500bcd4722263383c;p=emacs.git

* lisp/emacs-lisp/cconv.el (cconv-convert): Fix compiling compiled code

Don't conv-convert the docstring arg of defvar/defconst.
---

diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 02fe794467b..ca46dbb7b55 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -449,8 +449,11 @@ places where they originally did not directly appear."
 					;defconst, defvar
     (`(,(and sym (or `defconst `defvar)) ,definedsymbol . ,forms)
      `(,sym ,definedsymbol
-            . ,(mapcar (lambda (form) (cconv-convert form env extend))
-                       forms)))
+            . ,(when (consp forms)
+                 (cons (cconv-convert (car forms) env extend)
+                       ;; The rest (i.e. docstring, of any) is not evaluated,
+                       ;; and may be an invalid expression (e.g. ($# . 678)).
+                       (cdr forms)))))
 
 					;condition-case
     ((and `(condition-case ,var ,protected-form . ,handlers)