procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Don't conv-convert the docstring arg of defvar/defconst.
This commit is contained in:
Stefan Monnier 2018-02-02 10:28:34 -05:00
parent ecc6257f48
commit 6ff8b7749f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/emacs-lisp/cconv.el
View file

@ -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)