diff options
| author | Vibhav Pant <vibhavp@gmail.com> | 2018-03-25 11:22:50 +0530 |
|---|---|---|
| committer | Vibhav Pant <vibhavp@gmail.com> | 2018-03-25 11:22:50 +0530 |
| commit | d73d1384aa6d647a930b4dfe3e91505da4ffee21 (patch) | |
| tree | 54cf0a06f70575f10d07b04a1db7741dbd4f2bfd /lisp/emacs-lisp | |
| parent | a140513acb4ce27bd2b3472ee7a6ecb92676a8e9 (diff) | |
| download | emacs-d73d1384aa6d647a930b4dfe3e91505da4ffee21.tar.gz | |
Fix byte-optimize-memq incorrectly optimizing some memq forms.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-memq): Call
byte-optimize-and only for memq forms that can be optimized, use
byte-optimize-predicate to optimize the final form.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 54421e01be6..004f58cc12f 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -774,10 +774,11 @@ (when (and (eq (car-safe list) 'quote) (listp (setq list (cadr list))) (= (length list) 1)) - (setq form `(and ,(byte-optimize-predicate - `(eq ,(nth 1 form) ',(nth 0 list))) - ',list)))) - (byte-optimize-and form))) + (setq form (byte-optimize-and + `(and ,(byte-optimize-predicate + `(eq ,(nth 1 form) ',(nth 0 list))) + ',list))))) + (byte-optimize-predicate form))) (put 'identity 'byte-optimizer 'byte-optimize-identity) (put 'memq 'byte-optimizer 'byte-optimize-memq) |