byte-compile-setq-default fix for bug#12195
* lisp/emacs-lisp/bytecomp.el (byte-compile-setq-default): Optimize away setq-default with no args, as is done for setq.
This commit is contained in:
parent
f5d9e83a70
commit
c548f82180
2 changed files with 21 additions and 14 deletions
|
@ -3578,20 +3578,22 @@ discarding."
|
|||
|
||||
(defun byte-compile-setq-default (form)
|
||||
(setq form (cdr form))
|
||||
(if (> (length form) 2)
|
||||
(let ((setters ()))
|
||||
(while (consp form)
|
||||
(push `(setq-default ,(pop form) ,(pop form)) setters))
|
||||
(byte-compile-form (cons 'progn (nreverse setters))))
|
||||
(let ((var (car form)))
|
||||
(and (or (not (symbolp var))
|
||||
(macroexp--const-symbol-p var t))
|
||||
(byte-compile-warning-enabled-p 'constants)
|
||||
(byte-compile-warn
|
||||
"variable assignment to %s `%s'"
|
||||
(if (symbolp var) "constant" "nonvariable")
|
||||
(prin1-to-string var)))
|
||||
(byte-compile-normal-call `(set-default ',var ,@(cdr form))))))
|
||||
(if (null form) ; (setq-default), with no arguments
|
||||
(byte-compile-form nil byte-compile--for-effect)
|
||||
(if (> (length form) 2)
|
||||
(let ((setters ()))
|
||||
(while (consp form)
|
||||
(push `(setq-default ,(pop form) ,(pop form)) setters))
|
||||
(byte-compile-form (cons 'progn (nreverse setters))))
|
||||
(let ((var (car form)))
|
||||
(and (or (not (symbolp var))
|
||||
(macroexp--const-symbol-p var t))
|
||||
(byte-compile-warning-enabled-p 'constants)
|
||||
(byte-compile-warn
|
||||
"variable assignment to %s `%s'"
|
||||
(if (symbolp var) "constant" "nonvariable")
|
||||
(prin1-to-string var)))
|
||||
(byte-compile-normal-call `(set-default ',var ,@(cdr form)))))))
|
||||
|
||||
(byte-defop-compiler-1 set-default)
|
||||
(defun byte-compile-set-default (form)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue