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

Temporarily revert previous bytecomp change

Browse source
This commit is contained in:
Glenn Morris 2014-10-20 20:19:15 +01:00
parent 41e856b539
commit dfccf2f60d
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,8 +1,3 @@
2014-10-20 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
case (bug#18767).
2014-10-15 Alan Mackenzie <acm@muc.de>
* cus-edit.el (custom-command-apply): Specify the return value in

11
lisp/emacs-lisp/bytecomp.el
View file

@ -3261,11 +3261,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
(byte-defop-compiler cons 2)
(byte-defop-compiler aref 2)
(byte-defop-compiler set 2)
(byte-defop-compiler (= byte-eqlsign) 2) ;; -and bug#18767
(byte-defop-compiler (< byte-lss) 2) ;; -and bug#18767
(byte-defop-compiler (> byte-gtr) 2) ;; -and bug#18767
(byte-defop-compiler (<= byte-leq) 2) ;; -and bug#18767
(byte-defop-compiler (>= byte-geq) 2) ;; -and bug#18767
(byte-defop-compiler (= byte-eqlsign) 2-and)
(byte-defop-compiler (< byte-lss) 2-and)
(byte-defop-compiler (> byte-gtr) 2-and)
(byte-defop-compiler (<= byte-leq) 2-and)
(byte-defop-compiler (>= byte-geq) 2-and)
(byte-defop-compiler get 2)
(byte-defop-compiler nth 2)
(byte-defop-compiler substring 2-3)
@ -3332,7 +3332,6 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
(defun byte-compile-and-folded (form)
"Compile calls to functions like `<='.
These implicitly `and' together a bunch of two-arg bytecodes."
;; FIXME: bug#18767 means we can't do it this way!
(let ((l (length form)))
(cond
((< l 3) (byte-compile-form `(progn ,(nth 1 form) t)))