summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-05-17 22:49:02 +0100
committerAndrea Corallo <akrl@sdf.org>2020-05-17 22:49:02 +0100
commitcd4ef52c8673a76c6fcb0efd7d2c74778522038c (patch)
treeb3d4b99c92ddccc02a2f3ee846b11419dde1d892 /lisp/emacs-lisp
parent9e9421c7eecd74c9f163253ab760044fca53f26b (diff)
parentabec255c024938a40fa3c9730f602c0351e5877d (diff)
downloademacs-cd4ef52c8673a76c6fcb0efd7d2c74778522038c.tar.gz
emacs-cd4ef52c8673a76c6fcb0efd7d2c74778522038c.tar.bz2
emacs-cd4ef52c8673a76c6fcb0efd7d2c74778522038c.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 4f72251aed5..62b82e4f32a 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1509,7 +1509,7 @@
byte-current-buffer byte-stack-ref))
(defconst byte-compile-side-effect-free-ops
- (nconc
+ (append
'(byte-varref byte-nth byte-memq byte-car byte-cdr byte-length byte-aref
byte-symbol-value byte-get byte-concat2 byte-concat3 byte-sub1 byte-add1
byte-eqlsign byte-gtr byte-lss byte-leq byte-geq byte-diff byte-negate